linux-merge

linux-merge@lists.open-mesh.org

3 participants
7431 discussions

Failed check master distributed-arp-table.c
by postmaster＠open-mesh.org 06 Mar '12

06 Mar '12

CHECK: Coalesced strings are easier to grep and less error prone #60: FILE: distributed-arp-table.c:60: + bat_dbg(DBG_DAT, bat_priv, "* encapsulated within a UNICAST " + "packet\n"); CHECK: Coalesced strings are easier to grep and less error prone #64: FILE: distributed-arp-table.c:64: + bat_dbg(DBG_DAT, bat_priv, "* encapsulated within a " + "UNICAST_4ADDR packet (src: %pM)\n", CHECK: Coalesced strings are easier to grep and less error prone #85: FILE: distributed-arp-table.c:85: + bat_dbg(DBG_DAT, bat_priv, "* encapsulated within a BCAST " + "packet (src: %pM)\n", CHECK: Coalesced strings are easier to grep and less error prone #90: FILE: distributed-arp-table.c:90: + bat_dbg(DBG_DAT, bat_priv, "* encapsulated within an unknown " + "packet type (0x%x)\n", CHECK: Coalesced strings are easier to grep and less error prone #181: FILE: distributed-arp-table.c:181: + bat_dbg(DBG_DAT, bat_priv, "dht_select_candidates() %d: " + "selected %pM addr=%u dist=%u\n", select, CHECK: Coalesced strings are easier to grep and less error prone #210: FILE: distributed-arp-table.c:210: + bat_dbg(DBG_DAT, bat_priv, "dht_select_candidates(): IP=%pI4 " + "hash(IP)=%u\n", &ip_dst, ip_key); CHECK: Don't begin block comments with only a /* line, use /* comment... #218: FILE: distributed-arp-table.c:218: + +/* CHECK: Coalesced strings are easier to grep and less error prone #551: FILE: distributed-arp-table.c:551: + bat_dbg(DBG_DAT, bat_priv, "ARP Request for %pI4: " + "fallback prevented\n", CHECK: Coalesced strings are easier to grep and less error prone #569: FILE: distributed-arp-table.c:569: + pr_err("Unable to set ARP parameters for the batman interface " + "'%s'\n", name); total: 0 errors, 0 warnings, 9 checks, 580 lines checked NOTE: Ignored message types: COMPLEX_MACRO distributed-arp-table.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

Failed check master bridge_loop_avoidance.c
by postmaster＠open-mesh.org 06 Mar '12

06 Mar '12

CHECK: Don't begin block comments with only a /* line, use /* comment... #126: FILE: bridge_loop_avoidance.c:126: + +/* CHECK: Don't begin block comments with only a /* line, use /* comment... #166: FILE: bridge_loop_avoidance.c:166: + +/* CHECK: Don't begin block comments with only a /* line, use /* comment... #246: FILE: bridge_loop_avoidance.c:246: + +/* CHECK: No space is necessary after a cast #295: FILE: bridge_loop_avoidance.c:295: + ethhdr = (struct ethhdr *)skb->data; + hw_src = (uint8_t *) ethhdr + ETH_HLEN + sizeof(struct arphdr); CHECK: Don't begin block comments with only a /* line, use /* comment... #356: FILE: bridge_loop_avoidance.c:356: + +/* CHECK: Coalesced strings are easier to grep and less error prone #379: FILE: bridge_loop_avoidance.c:379: + "bla_get_backbone_gw(): not found (%pM, %d)," + " creating new entry\n", orig, vid); CHECK: Don't begin block comments with only a /* line, use /* comment... #414: FILE: bridge_loop_avoidance.c:414: + +/* CHECK: Don't begin block comments with only a /* line, use /* comment... #433: FILE: bridge_loop_avoidance.c:433: + +/* CHECK: Coalesced strings are easier to grep and less error prone #453: FILE: bridge_loop_avoidance.c:453: + "bla_answer_request(): received a " + "claim request, send all of our own claims again\n"); CHECK: Don't begin block comments with only a /* line, use /* comment... #481: FILE: bridge_loop_avoidance.c:481: + +/* CHECK: Don't begin block comments with only a /* line, use /* comment... #509: FILE: bridge_loop_avoidance.c:509: + +/* CHECK: No space is necessary after a cast #524: FILE: bridge_loop_avoidance.c:524: + crc = htons(backbone_gw->crc); + memcpy(&mac[4], (uint8_t *) &crc, 2); CHECK: Don't begin block comments with only a /* line, use /* comment... #530: FILE: bridge_loop_avoidance.c:530: + +/* CHECK: Don't begin block comments with only a /* line, use /* comment... #599: FILE: bridge_loop_avoidance.c:599: + +/* CHECK: No space is necessary after a cast #643: FILE: bridge_loop_avoidance.c:643: + backbone_gw->lasttime = jiffies; + crc = ntohs(*((uint16_t *) (&an_addr[4]))); CHECK: Coalesced strings are easier to grep and less error prone #647: FILE: bridge_loop_avoidance.c:647: + "handle_announce(): ANNOUNCE vid %d (sent " + "by %pM)... CRC = %04x\n", CHECK: Coalesced strings are easier to grep and less error prone #653: FILE: bridge_loop_avoidance.c:653: + "handle_announce(): CRC FAILED for %pM/%d" + "(my = %04x, sent = %04x)\n", CHECK: Coalesced strings are easier to grep and less error prone #688: FILE: bridge_loop_avoidance.c:688: + "handle_request(): REQUEST vid %d (sent " + "by %pM)...\n", CHECK: Coalesced strings are easier to grep and less error prone #715: FILE: bridge_loop_avoidance.c:715: + bat_dbg(DBG_BLA, bat_priv, "handle_unclaim():" + "UNCLAIM %pM on vid %d (sent by %pM)...\n", CHECK: No space is necessary after a cast #773: FILE: bridge_loop_avoidance.c:773: + + bla_dst = (struct bla_claim_dst *) hw_dst; CHECK: Don't begin block comments with only a /* line, use /* comment... #826: FILE: bridge_loop_avoidance.c:826: + +/* CHECK: No space is necessary after a cast #853: FILE: bridge_loop_avoidance.c:853: + if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) { + vhdr = (struct vlan_ethhdr *) ethhdr; CHECK: No space is necessary after a cast #871: FILE: bridge_loop_avoidance.c:871: + /* pskb_may_pull() may have modified the pointers, get ethhdr again */ + ethhdr = (struct ethhdr *) skb_mac_header(skb); CHECK: No space is necessary after a cast #872: FILE: bridge_loop_avoidance.c:872: + ethhdr = (struct ethhdr *) skb_mac_header(skb); + arphdr = (struct arphdr *) ((uint8_t *) ethhdr + headlen); CHECK: No space is necessary after a cast #888: FILE: bridge_loop_avoidance.c:888: + hw_dst = hw_src + ETH_ALEN + 4; + bla_dst = (struct bla_claim_dst *) hw_dst; CHECK: Coalesced strings are easier to grep and less error prone #894: FILE: bridge_loop_avoidance.c:894: + bat_dbg(DBG_BLA, bat_priv, "bla_process_claim(): received " + "a claim frame from another group. From: " CHECK: Coalesced strings are easier to grep and less error prone #895: FILE: bridge_loop_avoidance.c:895: + "a claim frame from another group. From: " + "%pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", CHECK: Coalesced strings are easier to grep and less error prone #928: FILE: bridge_loop_avoidance.c:928: + bat_dbg(DBG_BLA, bat_priv, "bla_process_claim(): ERROR - this looks" + "like a claim frame, but is useless. eth src" CHECK: Coalesced strings are easier to grep and less error prone #929: FILE: bridge_loop_avoidance.c:929: + "like a claim frame, but is useless. eth src" + "%pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", CHECK: Don't begin block comments with only a /* line, use /* comment... #934: FILE: bridge_loop_avoidance.c:934: + +/* CHECK: Coalesced strings are easier to grep and less error prone #966: FILE: bridge_loop_avoidance.c:966: + "bla_purge_backbone_gw(): backbone gw %pM" + " timed out\n", backbone_gw->orig); CHECK: Don't begin block comments with only a /* line, use /* comment... #1092: FILE: bridge_loop_avoidance.c:1092: + +/* CHECK: braces {} should be used on all arms of this statement #1160: FILE: bridge_loop_avoidance.c:1160: + if (primary_if) { [...] + } else [...] CHECK: No space is necessary after a cast #1215: FILE: bridge_loop_avoidance.c:1215: + length = hdr_size - sizeof(*bcast_packet); + content = (uint8_t *) bcast_packet; CHECK: No space is necessary after a cast #1321: FILE: bridge_loop_avoidance.c:1321: + + ethhdr = (struct ethhdr *) (((uint8_t *)skb->data) + hdr_size); CHECK: No space is necessary after a cast #1327: FILE: bridge_loop_avoidance.c:1327: + + vhdr = (struct vlan_ethhdr *) (((uint8_t *)skb->data) + CHECK: Coalesced strings are easier to grep and less error prone #1555: FILE: bridge_loop_avoidance.c:1555: + ret = seq_printf(seq, "BATMAN mesh %s disabled - please " + "specify interfaces to enable it\n", CHECK: Coalesced strings are easier to grep and less error prone #1562: FILE: bridge_loop_avoidance.c:1562: + ret = seq_printf(seq, "BATMAN mesh %s disabled - " + "primary interface not active\n", CHECK: Coalesced strings are easier to grep and less error prone #1568: FILE: bridge_loop_avoidance.c:1568: + seq_printf(seq, "Claims announced for the mesh %s " + "(orig %pM, group id %04x)\n", total: 0 errors, 0 warnings, 39 checks, 1592 lines checked NOTE: Ignored message types: COMPLEX_MACRO bridge_loop_avoidance.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

Failed check master bat_sysfs.c
by postmaster＠open-mesh.org 06 Mar '12

06 Mar '12

CHECK: Coalesced strings are easier to grep and less error prone #259: FILE: bat_sysfs.c:259: + "Invalid parameter for 'vis mode' setting received: " + "%s\n", buff); CHECK: Coalesced strings are easier to grep and less error prone #334: FILE: bat_sysfs.c:334: + "Invalid parameter for 'gw mode' setting received: " + "%s\n", buff); CHECK: Coalesced strings are easier to grep and less error prone #512: FILE: bat_sysfs.c:512: + pr_err("Invalid parameter for 'mesh_iface' setting received: " + "interface name too long '%s'\n", buff); CHECK: Coalesced strings are easier to grep and less error prone #687: FILE: bat_sysfs.c:687: + bat_dbg(DBG_BATMAN, bat_priv, "Impossible to send " + "uevent for (%s,%s,%s) event (err: %d)\n", total: 0 errors, 0 warnings, 4 checks, 691 lines checked NOTE: Ignored message types: COMPLEX_MACRO bat_sysfs.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

Failed check master bat_iv_ogm.c
by postmaster＠open-mesh.org 06 Mar '12

06 Mar '12

CHECK: Coalesced strings are easier to grep and less error prone #182: FILE: bat_iv_ogm.c:182: + "%s %spacket (originator %pM, seqno %u, TQ %d, TTL %d," + " IDF %s, ttvn %d) on interface %s [%pM]\n", CHECK: Coalesced strings are easier to grep and less error prone #221: FILE: bat_iv_ogm.c:221: + pr_err("Error - can't forward packet: incoming iface not " + "specified\n"); CHECK: Coalesced strings are easier to grep and less error prone #243: FILE: bat_iv_ogm.c:243: + "%s packet (originator %pM, seqno %u, TTL %d) " + "on interface %s [%pM]\n", CHECK: Coalesced strings are easier to grep and less error prone #558: FILE: bat_iv_ogm.c:558: + "Forwarding packet: tq_orig: %i, tq_avg: %i, " + "tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n", CHECK: Coalesced strings are easier to grep and less error prone #639: FILE: bat_iv_ogm.c:639: + bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): " + "Searching and updating originator entry of received packet\n"); CHECK: Don't begin block comments with only a /* line, use /* comment... #834: FILE: bat_iv_ogm.c:834: + + /* CHECK: Coalesced strings are easier to grep and less error prone #854: FILE: bat_iv_ogm.c:854: + "bidirectional: " + "orig = %-15pM neigh = %-15pM => own_bcast = %2i, " CHECK: Coalesced strings are easier to grep and less error prone #855: FILE: bat_iv_ogm.c:855: + "orig = %-15pM neigh = %-15pM => own_bcast = %2i, " + "real recv = %2i, local tq: %3i, asym_penalty: %3i, " CHECK: Coalesced strings are easier to grep and less error prone #856: FILE: bat_iv_ogm.c:856: + "real recv = %2i, local tq: %3i, asym_penalty: %3i, " + "total tq: %3i\n", CHECK: Coalesced strings are easier to grep and less error prone #988: FILE: bat_iv_ogm.c:988: + "Received BATMAN packet via NB: %pM, IF: %s [%pM] " + "(from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, " CHECK: Coalesced strings are easier to grep and less error prone #989: FILE: bat_iv_ogm.c:989: + "(from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, " + "crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n", CHECK: Coalesced strings are easier to grep and less error prone #1033: FILE: bat_iv_ogm.c:1033: + "Drop packet: received my own broadcast (sender: %pM" + ")\n", CHECK: Coalesced strings are easier to grep and less error prone #1040: FILE: bat_iv_ogm.c:1040: + bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: " + "ignoring all packets with broadcast source addr (sender: %pM" CHECK: Coalesced strings are easier to grep and less error prone #1041: FILE: bat_iv_ogm.c:1041: + "ignoring all packets with broadcast source addr (sender: %pM" + ")\n", ethhdr->h_source); CHECK: Coalesced strings are easier to grep and less error prone #1072: FILE: bat_iv_ogm.c:1072: + bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: " + "originator packet from myself (via neighbor)\n"); CHECK: Coalesced strings are easier to grep and less error prone #1080: FILE: bat_iv_ogm.c:1080: + "Drop packet: ignoring all rebroadcast echos (sender: " + "%pM)\n", ethhdr->h_source); CHECK: Coalesced strings are easier to grep and less error prone #1094: FILE: bat_iv_ogm.c:1094: + "Drop packet: packet within seqno protection time " + "(sender: %pM)\n", ethhdr->h_source); CHECK: Coalesced strings are easier to grep and less error prone #1116: FILE: bat_iv_ogm.c:1116: + "Drop packet: ignoring all rebroadcast packets that " + "may make me loop (sender: %pM)\n", ethhdr->h_source); CHECK: Coalesced strings are easier to grep and less error prone #1161: FILE: bat_iv_ogm.c:1161: + bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: " + "rebroadcast neighbor packet with direct link flag\n"); total: 0 errors, 0 warnings, 19 checks, 1268 lines checked NOTE: Ignored message types: COMPLEX_MACRO bat_iv_ogm.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120229
by batman＠open-mesh.org 29 Feb '12

29 Feb '12

The following commit has been merged in the master branch: commit 78d6942a45f86126ebdadd45418188b221d63344 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jan 12 19:07:00 2012 +0100 batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Actually the TT_CLIENT_PENDING flag is never set in the tt_global_entry structure, therefore this code is useless and can be removed. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 1ff7fbe..9a6f315 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -603,7 +603,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) struct tt_global_entry, common); seq_printf(seq, " * %pM (%3u) via %pM (%3u) " - "[%c%c%c]\n", + "[%c%c]\n", tt_global_entry->common.addr, tt_global_entry->ttvn, tt_global_entry->orig_node->orig, @@ -613,8 +613,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) (tt_global_entry->common.flags & TT_CLIENT_ROAM ? 'R' : '.'), (tt_global_entry->common.flags & - TT_CLIENT_PENDING ? 'X' : '.'), - (tt_global_entry->common.flags & TT_CLIENT_WIFI ? 'W' : '.')); } rcu_read_unlock(); @@ -838,11 +836,6 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv, if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount)) goto out; - /* A global client marked as PENDING has already moved from that - * originator */ - if (tt_global_entry->common.flags & TT_CLIENT_PENDING) - goto out; - orig_node = tt_global_entry->orig_node; out: -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120229
by batman＠open-mesh.org 29 Feb '12

29 Feb '12

The following commit has been merged in the master branch: commit fdc8ff101163f10d36187a890a3c4990cebb8b12 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 5 15:23:55 2012 +0100 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 6b276e1..1468788 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -28,7 +28,7 @@ #define DRIVER_DEVICE "batman-adv" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.0.0" +#define SOURCE_VERSION "2012.1.0" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120229
by batman＠open-mesh.org 29 Feb '12

29 Feb '12

The following commit has been merged in the master branch: commit 0695512a57a8ad5c0495b2a3b23b3216434e3f92 Merge: 5bd49735db39c1c1360cb91b1f1e1c999d90eb94 7c64fd98ce512de6c6dae0452dc026446bd368d5 Author: David S. Miller <davem(a)davemloft.net> Date: Tue Feb 28 15:07:52 2012 -0500 Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge diff --combined net/batman-adv/soft-interface.c index 2d8bd2a,c39c120..8fb16d2 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -1,5 -1,5 +1,5 @@@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@@ -396,8 -396,8 +396,8 @@@ void softif_neigh_purge(struct bat_pri hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2, &softif_neigh_vid->softif_neigh_list, list) { - if ((!time_after(jiffies, softif_neigh->last_seen + - msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) && + if ((!has_timed_out(softif_neigh->last_seen, + SOFTIF_NEIGH_TIMEOUT)) && (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) continue; @@@ -541,7 -541,6 +541,7 @@@ static int interface_set_mac_addr(struc } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; } @@@ -784,6 -783,7 +784,6 @@@ static const struct net_device_ops bat_ static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; ether_setup(dev); @@@ -800,7 -800,8 +800,7 @@@ dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + eth_hw_addr_random(dev); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120229
by batman＠open-mesh.org 29 Feb '12

29 Feb '12

The following commit has been merged in the master branch: commit 7c64fd98ce512de6c6dae0452dc026446bd368d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Feb 28 10:55:36 2012 +0100 batman-adv: Fix indentation of multiline statements Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index 7317729..b00101d 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -321,11 +321,11 @@ static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr, gw_mode_tmp = GW_MODE_OFF; if (strncmp(buff, GW_MODE_CLIENT_NAME, - strlen(GW_MODE_CLIENT_NAME)) == 0) + strlen(GW_MODE_CLIENT_NAME)) == 0) gw_mode_tmp = GW_MODE_CLIENT; if (strncmp(buff, GW_MODE_SERVER_NAME, - strlen(GW_MODE_SERVER_NAME)) == 0) + strlen(GW_MODE_SERVER_NAME)) == 0) gw_mode_tmp = GW_MODE_SERVER; if (gw_mode_tmp < 0) { diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index e63069d..6d0aa21 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -154,8 +154,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, /* sequence number is much newer, probably missed a lot of packets */ - if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) - && (seq_num_diff < EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) && + (seq_num_diff < EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, bat_priv, "We missed a lot of packets (%i) !\n", seq_num_diff - 1); @@ -170,8 +170,8 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, * packet should be dropped without calling this function if the * seqno window is protected. */ - if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) - || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || + (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, bat_priv, "Other host probably restarted!\n"); diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 65a77a1..0fa8e2d 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -629,7 +629,7 @@ bool gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) /* check for bootp port */ if ((ntohs(ethhdr->h_proto) == ETH_P_IP) && - (ntohs(udphdr->dest) != 67)) + (ntohs(udphdr->dest) != 67)) return false; if ((ntohs(ethhdr->h_proto) == ETH_P_IPV6) && diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 7f79e15..3ccb9c8 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -93,7 +93,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, multi = 1024; if ((strnicmp(tmp_ptr, "kbit", 4) == 0) || - (multi > 1)) + (multi > 1)) *tmp_ptr = '\0'; } @@ -118,7 +118,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, multi = 1024; if ((strnicmp(tmp_ptr, "kbit", 4) == 0) || - (multi > 1)) + (multi > 1)) *tmp_ptr = '\0'; } diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 41826b9..409d027 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -341,23 +341,23 @@ int hardif_enable_interface(struct hard_iface *hard_iface, if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < ETH_DATA_LEN + BAT_HEADER_LEN) bat_info(hard_iface->soft_iface, - "The MTU of interface %s is too small (%i) to handle " - "the transport of batman-adv packets. Packets going " - "over this interface will be fragmented on layer2 " - "which could impact the performance. Setting the MTU " - "to %zi would solve the problem.\n", - hard_iface->net_dev->name, hard_iface->net_dev->mtu, - ETH_DATA_LEN + BAT_HEADER_LEN); + "The MTU of interface %s is too small (%i) to handle " + "the transport of batman-adv packets. Packets going " + "over this interface will be fragmented on layer2 " + "which could impact the performance. Setting the MTU " + "to %zi would solve the problem.\n", + hard_iface->net_dev->name, hard_iface->net_dev->mtu, + ETH_DATA_LEN + BAT_HEADER_LEN); if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu < ETH_DATA_LEN + BAT_HEADER_LEN) bat_info(hard_iface->soft_iface, - "The MTU of interface %s is too small (%i) to handle " - "the transport of batman-adv packets. If you experience" - " problems getting traffic through try increasing the " - "MTU to %zi.\n", - hard_iface->net_dev->name, hard_iface->net_dev->mtu, - ETH_DATA_LEN + BAT_HEADER_LEN); + "The MTU of interface %s is too small (%i) to handle " + "the transport of batman-adv packets. If you " + "experience problems getting traffic through try " + "increasing the MTU to %zi.\n", + hard_iface->net_dev->name, hard_iface->net_dev->mtu, + ETH_DATA_LEN + BAT_HEADER_LEN); if (hardif_is_iface_up(hard_iface)) hardif_activate_interface(hard_iface); @@ -580,8 +580,8 @@ static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, goto err_free; /* expect a valid ethernet header here. */ - if (unlikely(skb->mac_len != sizeof(struct ethhdr) - || !skb_mac_header(skb))) + if (unlikely(skb->mac_len != sizeof(struct ethhdr) || + !skb_mac_header(skb))) goto err_free; if (!hard_iface->soft_iface) diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index c2e46b5..371cc93 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -143,7 +143,7 @@ static void orig_node_free_rcu(struct rcu_head *rcu) frag_list_free(&orig_node->frag_list); tt_global_del_orig(orig_node->bat_priv, orig_node, - "originator timed out"); + "originator timed out"); kfree(orig_node->tt_buff); kfree(orig_node->bcast_own); @@ -333,9 +333,8 @@ static bool purge_orig_node(struct bat_priv *bat_priv, return true; } else { if (purge_orig_neighbors(bat_priv, orig_node, - &best_neigh_node)) { + &best_neigh_node)) update_route(bat_priv, orig_node, best_neigh_node); - } } return false; diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index cf9a2f6..f535155 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -72,7 +72,7 @@ static void _update_route(struct bat_priv *bat_priv, bat_dbg(DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", orig_node->orig); tt_global_del_orig(bat_priv, orig_node, - "Deleted route towards originator"); + "Deleted route towards originator"); /* route added */ } else if ((!curr_router) && (neigh_node)) { @@ -229,8 +229,8 @@ void bonding_save_primary(const struct orig_node *orig_node, int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, unsigned long *last_reset) { - if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) - || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { + if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || + (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) { *last_reset = jiffies; @@ -429,7 +429,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if) if ((hdr_size == sizeof(struct icmp_packet_rr)) && (icmp_packet->rr_cur < BAT_RR_LEN)) { memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]), - ethhdr->h_dest, ETH_ALEN); + ethhdr->h_dest, ETH_ALEN); icmp_packet->rr_cur++; } diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 2ffdc74..c39c120 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -397,7 +397,7 @@ void softif_neigh_purge(struct bat_priv *bat_priv) &softif_neigh_vid->softif_neigh_list, list) { if ((!has_timed_out(softif_neigh->last_seen, - SOFTIF_NEIGH_TIMEOUT)) && + SOFTIF_NEIGH_TIMEOUT)) && (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE)) continue; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 9a6f315..c950705 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -261,7 +261,7 @@ int tt_changes_fill_buffer(struct bat_priv *bat_priv, atomic_set(&bat_priv->tt_local_changes, 0); list_for_each_entry_safe(entry, safe, &bat_priv->tt_changes_list, - list) { + list) { if (count < tot_changes) { memcpy(buff + tt_len(count), &entry->change, sizeof(struct tt_change)); @@ -333,17 +333,17 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset) hlist_for_each_entry_rcu(tt_common_entry, node, head, hash_entry) { seq_printf(seq, " * %pM [%c%c%c%c%c]\n", - tt_common_entry->addr, - (tt_common_entry->flags & - TT_CLIENT_ROAM ? 'R' : '.'), - (tt_common_entry->flags & - TT_CLIENT_NOPURGE ? 'P' : '.'), - (tt_common_entry->flags & - TT_CLIENT_NEW ? 'N' : '.'), - (tt_common_entry->flags & - TT_CLIENT_PENDING ? 'X' : '.'), - (tt_common_entry->flags & - TT_CLIENT_WIFI ? 'W' : '.')); + tt_common_entry->addr, + (tt_common_entry->flags & + TT_CLIENT_ROAM ? 'R' : '.'), + (tt_common_entry->flags & + TT_CLIENT_NOPURGE ? 'P' : '.'), + (tt_common_entry->flags & + TT_CLIENT_NEW ? 'N' : '.'), + (tt_common_entry->flags & + TT_CLIENT_PENDING ? 'X' : '.'), + (tt_common_entry->flags & + TT_CLIENT_WIFI ? 'W' : '.')); } rcu_read_unlock(); } @@ -704,7 +704,7 @@ void tt_global_del_orig(struct bat_priv *bat_priv, spin_lock_bh(list_lock); hlist_for_each_entry_safe(tt_common_entry, node, safe, - head, hash_entry) { + head, hash_entry) { tt_global_entry = container_of(tt_common_entry, struct tt_global_entry, common); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120229
by batman＠open-mesh.org 29 Feb '12

29 Feb '12

The following commit has been merged in the master branch: commit 567db7b0b7c0a94cc62846f8ebb429bdda2884bc Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 1 00:41:38 2012 +0100 batman-adv: Update copyright years Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index ce68611..4e392eb 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index 755379f..9852a68 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c index a7a393e..c3b0548 100644 --- a/net/batman-adv/bat_debugfs.c +++ b/net/batman-adv/bat_debugfs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bat_debugfs.h b/net/batman-adv/bat_debugfs.h index bc9cda3..d605c67 100644 --- a/net/batman-adv/bat_debugfs.h +++ b/net/batman-adv/bat_debugfs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1c483a5..2b66dae 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index 480ae0a..7317729 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bat_sysfs.h b/net/batman-adv/bat_sysfs.h index a3f75a7..fece77a 100644 --- a/net/batman-adv/bat_sysfs.h +++ b/net/batman-adv/bat_sysfs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 9bc63b2..e63069d 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 9c04422..c613572 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index df5631e..65a77a1 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index e1edba0..bf56a5a 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index c4ac7b0..7f79e15 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index 55e527a..b8fb11c 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index ff5ba40..41826b9 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 67f78d1..e68c565 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index d1da29d..117687b 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index 4768717..d4bd786 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 5d69e10..9b755f9 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 462b190..380ed4c 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 8ae497b..08f3b3a 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ecfed88..6b276e1 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 1161f27..c2e46b5 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 67765ff..3fe2eda 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 88c717b..441f3db 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/ring_buffer.c b/net/batman-adv/ring_buffer.c index f1ccfa7..fd63951 100644 --- a/net/batman-adv/ring_buffer.c +++ b/net/batman-adv/ring_buffer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/ring_buffer.h b/net/batman-adv/ring_buffer.h index 7cdfe62..8b58bd8 100644 --- a/net/batman-adv/ring_buffer.h +++ b/net/batman-adv/ring_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index c1e45c0..cf9a2f6 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 7aaee0f..92ac100 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 019337e..4137580 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index c8ca3ef..824ef06 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index c41dac3..2ffdc74 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 001546f..756eab5 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 30c2d1b..4dc5af3 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 30efd49..c753633 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 650ce5f..302efb5 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index 6f3c659..0897dfa 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Andreas Langer * diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h index 8fd5535..a9faf6b 100644 --- a/net/batman-adv/unicast.h +++ b/net/batman-adv/unicast.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Andreas Langer * diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index 4f4b2a0..c4a5b8c 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/vis.h b/net/batman-adv/vis.h index 851bc4f..ee2e46e 100644 --- a/net/batman-adv/vis.h +++ b/net/batman-adv/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120229
by batman＠open-mesh.org 29 Feb '12

29 Feb '12

The following commit has been merged in the master branch: commit c566dbbef029d7ea957e9566e3073e68b9e05de9 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:34 2012 +0100 batman-adv: code refactoring - move debug print into tt_local_set_pending Each tt_local_set_pending is always followed by a bat_dbg invocation. This can be simplified by moving the bat_dbg() call. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 9be9c41..1ff7fbe 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -355,7 +355,7 @@ out: static void tt_local_set_pending(struct bat_priv *bat_priv, struct tt_local_entry *tt_local_entry, - uint16_t flags) + uint16_t flags, const char *message) { tt_local_event(bat_priv, tt_local_entry->common.addr, tt_local_entry->common.flags | flags); @@ -364,6 +364,9 @@ static void tt_local_set_pending(struct bat_priv *bat_priv, * to be kept in the table in order to send it in a full table * response issued before the net ttvn increment (consistency check) */ tt_local_entry->common.flags |= TT_CLIENT_PENDING; + + bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " + "%s\n", tt_local_entry->common.addr, message); } void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, @@ -376,10 +379,7 @@ void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, goto out; tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL | - (roaming ? TT_CLIENT_ROAM : NO_FLAGS)); - - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " - "%s\n", tt_local_entry->common.addr, message); + (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message); out: if (tt_local_entry) tt_local_entry_free_ref(tt_local_entry); @@ -417,10 +417,7 @@ static void tt_local_purge(struct bat_priv *bat_priv) continue; tt_local_set_pending(bat_priv, tt_local_entry, - TT_CLIENT_DEL); - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) " - "pending to be removed: timed out\n", - tt_local_entry->common.addr); + TT_CLIENT_DEL, "timed out"); } spin_unlock_bh(list_lock); } -- LinuxNextTracking

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge