linux-merge

linux-merge@lists.open-mesh.org

2 participants
7455 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit e3b0d0dea6e044283dff1c0852b20c98eb41a7f1 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:32 2012 +0800 batman-adv: prepare lq_update_lock to be shared among different protocols Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index abd10c4..dc53798 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -43,7 +43,6 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, goto out; INIT_LIST_HEAD(&neigh_node->bonding_list); - spin_lock_init(&neigh_node->tq_lock); neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; @@ -637,12 +636,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, if (is_duplicate) continue; - spin_lock_bh(&tmp_neigh_node->tq_lock); + spin_lock_bh(&tmp_neigh_node->lq_update_lock); ring_buffer_set(tmp_neigh_node->tq_recv, &tmp_neigh_node->tq_index, 0); tmp_neigh_node->tq_avg = ring_buffer_avg(tmp_neigh_node->tq_recv); - spin_unlock_bh(&tmp_neigh_node->tq_lock); + spin_unlock_bh(&tmp_neigh_node->lq_update_lock); } if (!neigh_node) { @@ -668,12 +667,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, orig_node->flags = batman_ogm_packet->flags; neigh_node->last_seen = jiffies; - spin_lock_bh(&neigh_node->tq_lock); + spin_lock_bh(&neigh_node->lq_update_lock); ring_buffer_set(neigh_node->tq_recv, &neigh_node->tq_index, batman_ogm_packet->tq); neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv); - spin_unlock_bh(&neigh_node->tq_lock); + spin_unlock_bh(&neigh_node->lq_update_lock); if (!is_duplicate) { orig_node->last_ttl = batman_ogm_packet->header.ttl; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index f4b6201..41147942 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -99,6 +99,7 @@ struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, INIT_HLIST_NODE(&neigh_node->list); memcpy(neigh_node->addr, neigh_addr, ETH_ALEN); + spin_lock_init(&neigh_node->lq_update_lock); /* extra reference for return */ atomic_set(&neigh_node->refcount, 2); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 66a3750..61308e8 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -137,7 +137,7 @@ struct neigh_node { struct rcu_head rcu; struct orig_node *orig_node; struct hard_iface *if_incoming; - spinlock_t tq_lock; /* protects: tq_recv, tq_index */ + spinlock_t lq_update_lock; /* protects: tq_recv, tq_index */ }; #ifdef CONFIG_BATMAN_ADV_BLA -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit 8710e2613a4819aac44f4aed7e29027ac3eeb683 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Mar 16 11:52:31 2012 +0100 batman-adv: avoid skb_linearise() if not needed Whenever we want to access headers only, we do not need to linearise the whole packet. Instead we can use pskb_may_pull() Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 7ed9d8f..4c6467d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -916,8 +916,9 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, /* Check whether I have to reroute the packet */ if (seq_before(unicast_packet->ttvn, curr_ttvn) || tt_poss_change) { - /* Linearize the skb before accessing it */ - if (skb_linearize(skb) < 0) + /* check if there is enough data before accessing it */ + if (pskb_may_pull(skb, sizeof(struct unicast_packet) + + ETH_HLEN) < 0) return 0; ethhdr = (struct ethhdr *)(skb->data + -- LinuxNextTracking

1 0

Build check errors found: 2012-05-16
by postmaster＠open-mesh.org 15 May '12

15 May '12

Name of failed tests ==================== unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> batadv_tt_local_crc

1 0

Build check errors found: 2012-05-15
by postmaster＠open-mesh.org 14 May '12

14 May '12

Name of failed tests ==================== Comment ending without space next Multiline comment ending at a non-empty line next Multiline comment starting with empty line next unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y Output of different failed tests ================================ Comment ending without space next: >>>>>>>> bat_sysfs.c:156: * unsigned integer value*/ bridge_loop_avoidance.c:1187: **/ gateway_client.c:159: **/ gateway_client.c:196: **/ gateway_client.c:281: **/ gateway_common.c:162: **/ routing.c:702: * refcount.*/ soft-interface.c:305:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/ vis.c:496: * hash.*/ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ types.h:380: /* vis_info may follow here*/ Multiline comment ending at a non-empty line next: >>>>>>>> bat_iv_ogm.c:169: * ordinary base packet */ bat_iv_ogm.c:314: * are flooded through the net */ bat_iv_ogm.c:320: * interfaces leave only that interface */ bat_iv_ogm.c:328: * interface only - we still can aggregate */ bat_iv_ogm.c:335: * (= secondary interface packets in general) */ bat_iv_ogm.c:481: * suitable aggregation packet found */ bat_iv_ogm.c:685: * to change */ bat_iv_ogm.c:695: * won't consider it either */ bat_iv_ogm.c:717: * sent through a primary interface */ bat_iv_ogm.c:814: * information */ bat_iv_ogm.c:840: * consider it bidirectional */ bat_iv_ogm.c:1031: * come via the corresponding interface */ bat_iv_ogm.c:1109: * originator mac */ bat_iv_ogm.c:1119: * don't route towards it */ bat_iv_ogm.c:1132: * seqno and similar ttl as the non-duplicate */ bat_sysfs.c:87: * (bat_priv) on or off */ bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */ bat_sysfs.c:156: * unsigned integer value*/ bitarray.c:49: * higher than this one, so we just mark it. */ bitarray.c:58: * set the mark if required */ bitarray.c:84: * seqno window is protected. */ distributed-arp-table.c:336: * IP information */ distributed-arp-table.c:350: * will simply ignore it */ gateway_client.c:36: * the beginning of the dhcp header */ gateway_client.c:533: * - octet 3: option data */ gateway_client.c:538: * Jump the len octet and go to the data octet */ gateway_client.c:666: * set the tq towards ourself as the maximum value */ gateway_client.c:680: * reliable enough */ hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */ hard-interface.c:550: * 802.11 wireless device */ hard-interface.c:565: * check for wireless_handlers != NULL */ icmp_socket.c:315: * deleted */ main.c:40: * list traversals just rcu-locked */ main.c:62: * http://lwn.net/Articles/23634/ */ originator.c:192: * address if it does not exits */ originator.c:523: * if_num */ originator.c:606: * if_num */ routing.c:180: * considered as candidate. */ routing.c:476: * returned router's refcount. */ routing.c:509: * after the current router */ routing.c:512: * does not exist as rcu version */ routing.c:527: * Increases the returned router's refcount */ routing.c:548: * or this one is better, choose it. */ routing.c:552: * previously selected router */ routing.c:604: * forwarded */ routing.c:617: * changes */ routing.c:691: * packets for the correct destination. */ routing.c:702: * refcount.*/ routing.c:721: * always choose the default router. */ routing.c:734: * for a potential bonding candidate. */ routing.c:739: * even be the same as our router_orig in many cases */ routing.c:753: * bonding and prefer the original router. */ routing.c:759: * in. */ routing.c:1080: * if required. */ send.c:36: * specified batman interface */ send.c:73: * (which is > 0). This will not be treated as an error. */ send.c:109: * and wait for the tt table request which will be fragmented */ send.c:208: * skb is freed. */ soft-interface.c:178: * requests into the mesh */ soft-interface.c:185: * via unicast to their gateway */ soft-interface.c:216: * this mac is known throughout the mesh */ soft-interface.c:227: * the original skb. */ soft-interface.c:303: * -- Dec 21st 2009, Simon Wunderlich */ translation-table.c:235: * (consistency check) */ translation-table.c:308: * problems */ translation-table.c:392: * response issued before the net ttvn increment (consistency check) */ translation-table.c:853: * the global entry, since it is useless now. */ translation-table.c:1026: * isolation */ translation-table.c:1125: * account while computing the CRC */ translation-table.c:1162: * last OGM (the OGM could carry no changes) */ translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */ translation-table.c:1301: * copied */ translation-table.c:1324: * reply from the same orig_node yet */ translation-table.c:1430: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1540: * is too big send the whole local translation table */ translation-table.c:1548: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1712: * consistency purpose) */ translation-table.c:1761: * unset the flag */ translation-table.c:1814: * returns true if the ROAMING_ADV can be sent, false otherwise */ translation-table.c:1823: * reply from the same orig_node yet */ translation-table.c:1866: * already roamed to us too many times */ translation-table.c:1938: * in the given hash table and returns the number of modified entries */ translation-table.c:2019: * entries */ translation-table.c:2072: * increased by one -> we can apply the attached changes */ translation-table.c:2077: * In this case send a tt request */ translation-table.c:2088: * in the global table */ translation-table.c:2098: * inconsistency */ translation-table.c:2103: * unset the flag */ translation-table.c:2107: * in sync anymore -> request fresh tt data */ unicast.c:368: * returns NULL in case of AP isolation */ vis.c:121: * does not already exist in the list */ vis.c:330: * already linked in. */ vis.c:340: * linked in. */ vis.c:384: * is newer than old entries in the hash. */ vis.c:496: * hash.*/ vis.c:550: * Must be called with the originator hash locked */ vis.c:601: * returns 0 on success, -1 if no packet could be generated */ vis.c:699: * held */ vis.c:758: * this node. */ vis.c:874: * initialized (e.g. bat0 is initialized, interfaces have been added) */ bitarray.h:26: * and curr_seqno is within range of last_seqno */ bitarray.h:50: * new, 0 if old */ hash.h:30: * same */ hash.h:35: * argument and the size the second */ hash.h:53: * elements, memory might be leaked. */ hash.h:136: * comparing. */ main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ main.h:48: * (should be a multiple of our word size) */ main.h:51: * pending tt_req */ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ main.h:84: * candidates */ main.h:88: * forw_packet->direct_link_flags */ main.h:252: * - after adding more than 127 to the starting value - it is a successor */ packet.h:92: * 1 << 15 are used for local computation only */ packet.h:153: * as this is assumed by code that handles ICMP packets */ packet.h:209: * - TT_FULL_TABLE */ packet.h:217: * orig_node */ packet.h:222: * if TT_RESPONSE: table_size */ types.h:103: * soon as I receive a new TTVN from this orig_node */ types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */ types.h:191: * increase my TTVN */ types.h:372: * from. we should not reply to them. */ vis.h:26: * in miliseconds */ Multiline comment starting with empty line next: >>>>>>>> bat_debugfs.c:1:/* bat_iv_ogm.c:1:/* bat_iv_ogm.c:286: /** bat_iv_ogm.c:300: /** bat_iv_ogm.c:451: /** bat_iv_ogm.c:486: /** bat_sysfs.c:1:/* bitarray.c:1:/* bridge_loop_avoidance.c:1:/* bridge_loop_avoidance.c:126:/** bridge_loop_avoidance.c:165:/** bridge_loop_avoidance.c:244:/** bridge_loop_avoidance.c:350:/** bridge_loop_avoidance.c:425:/** bridge_loop_avoidance.c:471:/** bridge_loop_avoidance.c:498:/** bridge_loop_avoidance.c:519:/** bridge_loop_avoidance.c:734:/** bridge_loop_avoidance.c:813:/** bridge_loop_avoidance.c:966:/** bridge_loop_avoidance.c:1014:/** bridge_loop_avoidance.c:1173:/** bridge_loop_avoidance.c:1240:/** bridge_loop_avoidance.c:1281:/** bridge_loop_avoidance.c:1350:/** bridge_loop_avoidance.c:1439:/** compat.c:1:/* distributed-arp-table.c:1:/* gateway_client.c:1:/* gateway_client.c:152: default: /** gateway_client.c:191: /** gateway_client.c:278: /** gateway_client.c:337: /** gateway_client.c:425:/** gateway_common.c:1:/* gateway_common.c:158: /** hard-interface.c:1:/* hard-interface.c:237: /** hard-interface.c:444: /** hash.c:1:/* icmp_socket.c:1:/* main.c:1:/* originator.c:1:/* ring_buffer.c:1:/* routing.c:1:/* routing.c:168: /** routing.c:400: /** send.c:1:/* send.c:142: /** send.c:326: /** send.c:362: /** send.c:372: /** send.c:391: /** send.c:401: /** soft-interface.c:1:/* soft-interface.c:62: /** soft-interface.c:350: /** translation-table.c:1:/* translation-table.c:310: /** unicast.c:1:/* unicast.c:372: /** vis.c:1:/* bat_algo.h:1:/* bat_debugfs.h:1:/* bat_sysfs.h:1:/* bitarray.h:1:/* bridge_loop_avoidance.h:1:/* compat.h:1:/* distributed-arp-table.h:1:/* gateway_client.h:1:/* gateway_common.h:1:/* hard-interface.h:1:/* hash.h:1:/* hash.h:79:/** icmp_socket.h:1:/* main.h:1:/* main.h:216:/** main.h:227:/** originator.h:1:/* packet.h:1:/* ring_buffer.h:1:/* routing.h:1:/* send.h:1:/* soft-interface.h:1:/* translation-table.h:1:/* types.h:1:/* types.h:63:/** types.h:135:/** types.h:329:/** unicast.h:1:/* vis.h:1:/* unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> batadv_tt_local_crc unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> prepare_unicast_4addr_packet

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit c64703aace094bd2836bb0755b7faf8b4cbab998 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Mar 14 12:57:02 2012 +0100 batman-adv: update copyright years update copyright years in order to include 2012 Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index ad394c6..8bf9751 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -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: * * Simon Wunderlich * diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 4a8e4fc..e39f93a 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.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: * * Simon Wunderlich * -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 35c133a000d54b7e3fe81e8c8e4b8af5878ad6dd Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Mar 14 13:03:01 2012 +0100 batman-adv: add contributor name translation_table.{c,h} have been heavily modified by another contributor and for legal purposes it is better to include his name into the contributor list Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index a38d315..2cb46f0 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * - * Marek Lindner, Simon Wunderlich + * Marek Lindner, Simon Wunderlich, Antonio Quartulli * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index bfebe26..593d1b3 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * - * Marek Lindner, Simon Wunderlich + * Marek Lindner, Simon Wunderlich, Antonio Quartulli * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit fefa53297112f85d99d77374c745e247ba78831c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:34 2012 +0800 batman-adv: fix checkpatch string complaint Regression introduced by: f76d019194e0a88c57371df169ecc979690a04c2 Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index bafb473..abd10c4 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1061,8 +1061,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, if (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP) { bat_dbg(DBG_BATMAN, bat_priv, - "Drop packet: ignoring all packets not forwarded from " - "the best next hop (sender: %pM)\n", ethhdr->h_source); + "Drop packet: ignoring all packets not forwarded from the best next hop (sender: %pM)\n", + ethhdr->h_source); return; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 13b2541b11b1df346805f0869c843635ceb0229f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Mar 11 06:17:53 2012 +0800 batman-adv: avoid temporary routing loops by being strict on forwarded OGMs batman-adv would forward OGMs from non-besthops while replacing the the TQ and TTL values with the values from the best hop. In certain corner cases this leads to a temporary routing loop. This patch changes this behavior: Only packets from best next hops are forwarded - TQ and TTL values won't be replaced anymore. However, the protocol needs to rebroadcast OGMs from single hop neighbors regardless of whether or not they are the best hop. To handle this case a new flag is introduced to alert neighboring nodes about the forwarded OGM that is not from my best next hop. It is to be discarded by all nodes except for the one originating the OGM. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Daniele Furlan <daniele.furlan(a)gmail.com> Tested-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 9074e74..bafb473 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -507,11 +507,10 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, const struct ethhdr *ethhdr, struct batman_ogm_packet *batman_ogm_packet, bool is_single_hop_neigh, + bool is_from_best_next_hop, struct hard_iface *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); - struct neigh_node *router; - uint8_t in_tq, in_ttl, tq_avg = 0; uint8_t tt_num_changes; if (batman_ogm_packet->header.ttl <= 1) { @@ -519,41 +518,30 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, return; } - router = orig_node_get_router(orig_node); + if (!is_from_best_next_hop) { + /* Mark the forwarded packet when it is not coming from our + * best next hop. We still need to forward the packet for our + * neighbor link quality detection to work in case the packet + * originated from a single hop neighbor. Otherwise we can + * simply drop the ogm. + */ + if (is_single_hop_neigh) + batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP; + else + return; + } - in_tq = batman_ogm_packet->tq; - in_ttl = batman_ogm_packet->header.ttl; tt_num_changes = batman_ogm_packet->tt_num_changes; batman_ogm_packet->header.ttl--; memcpy(batman_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN); - /* rebroadcast tq of our best ranking neighbor to ensure the rebroadcast - * of our best tq value */ - if (router && router->tq_avg != 0) { - - /* rebroadcast ogm of best ranking neighbor as is */ - if (!compare_eth(router->addr, ethhdr->h_source)) { - batman_ogm_packet->tq = router->tq_avg; - - if (router->last_ttl) - batman_ogm_packet->header.ttl = - router->last_ttl - 1; - } - - tq_avg = router->tq_avg; - } - - if (router) - neigh_node_free_ref(router); - /* apply hop penalty */ batman_ogm_packet->tq = hop_penalty(batman_ogm_packet->tq, bat_priv); bat_dbg(DBG_BATMAN, bat_priv, - "Forwarding packet: tq_orig: %i, tq_avg: %i, tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n", - in_tq, tq_avg, batman_ogm_packet->tq, in_ttl - 1, - batman_ogm_packet->header.ttl); + "Forwarding packet: tq: %i, ttl: %i\n", + batman_ogm_packet->tq, batman_ogm_packet->header.ttl); batman_ogm_packet->seqno = htonl(batman_ogm_packet->seqno); batman_ogm_packet->tt_crc = htons(batman_ogm_packet->tt_crc); @@ -949,6 +937,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; int is_broadcast = 0, is_bidirectional; bool is_single_hop_neigh = false; + bool is_from_best_next_hop = false; int is_duplicate; uint32_t if_incoming_seqno; @@ -1070,6 +1059,13 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, return; } + if (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP) { + bat_dbg(DBG_BATMAN, bat_priv, + "Drop packet: ignoring all packets not forwarded from " + "the best next hop (sender: %pM)\n", ethhdr->h_source); + return; + } + orig_node = get_orig_node(bat_priv, batman_ogm_packet->orig); if (!orig_node) return; @@ -1094,6 +1090,10 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, if (router) router_router = orig_node_get_router(router->orig_node); + if ((router && router->tq_avg != 0) && + (compare_eth(router->addr, ethhdr->h_source))) + is_from_best_next_hop = true; + /* avoid temporary routing loops */ if (router && router_router && (compare_eth(router->addr, batman_ogm_packet->prev_sender)) && @@ -1144,7 +1144,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, /* mark direct link on incoming interface */ bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet, - is_single_hop_neigh, if_incoming); + is_single_hop_neigh, is_from_best_next_hop, + if_incoming); bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: rebroadcast neighbor packet with direct link flag\n"); @@ -1167,7 +1168,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: rebroadcast originator packet\n"); bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet, - is_single_hop_neigh, if_incoming); + is_single_hop_neigh, is_from_best_next_hop, + if_incoming); out_neigh: if ((orig_neigh_node) && (!is_single_hop_neigh)) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index f54969c..0ee1af7 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -39,6 +39,7 @@ enum bat_packettype { #define COMPAT_VERSION 14 enum batman_iv_flags { + NOT_BEST_NEXT_HOP = 1 << 3, PRIMARIES_FIRST_HOP = 1 << 4, VIS_SERVER = 1 << 5, DIRECTLINK = 1 << 6 -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 9d853f624691776232a675768bcdb239d7b837ea Author: Linus Luessing <linus.luessing(a)web.de> Date: Sun Mar 11 06:17:52 2012 +0800 batman-adv: Adding hard_iface specific sysfs wrapper macros for UINT This allows us to easily add a sysfs parameter for an unsigned int later, which is not for a batman mesh interface (e.g. bat0), but for a common interface instead. It allows reading and writing an atomic_t in hard_iface (instead of bat_priv compared to the mesh variant). Developed by Linus during a 6 months trainee study period in Ascom (Switzerland) AG. Signed-off-by: Linus Luessing <linus.luessing(a)web.de> 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 913299d..5bc7b66 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -117,6 +117,49 @@ ssize_t show_##_name(struct kobject *kobj, \ static BAT_ATTR(_name, _mode, show_##_name, store_##_name) +#define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \ +ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ + char *buff, size_t count) \ +{ \ + struct net_device *net_dev = kobj_to_netdev(kobj); \ + struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev); \ + ssize_t length; \ + \ + if (!hard_iface) \ + return 0; \ + \ + length = __store_uint_attr(buff, count, _min, _max, _post_func, \ + attr, &hard_iface->_name, net_dev); \ + \ + hardif_free_ref(hard_iface); \ + return length; \ +} + +#define BAT_ATTR_HIF_SHOW_UINT(_name) \ +ssize_t show_##_name(struct kobject *kobj, \ + struct attribute *attr, char *buff) \ +{ \ + struct net_device *net_dev = kobj_to_netdev(kobj); \ + struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev); \ + ssize_t length; \ + \ + if (!hard_iface) \ + return 0; \ + \ + length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_name));\ + \ + hardif_free_ref(hard_iface); \ + return length; \ +} + +/* Use this, if you are going to set [name] in hard_iface to an + * unsigned integer value*/ +#define BAT_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func) \ + static BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \ + static BAT_ATTR_HIF_SHOW_UINT(_name) \ + static BAT_ATTR(_name, _mode, show_##_name, store_##_name) + + static int store_bool_attr(char *buff, size_t count, struct net_device *net_dev, const char *attr_name, atomic_t *attr) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit f245c38ba74e1433294b5f41c9d6eb3e97b88e5b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Mar 11 06:17:51 2012 +0800 batman-adv: rename sysfs macros to reflect the soft-interface dependency Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index 2c81688..913299d 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -63,7 +63,7 @@ struct bat_attribute bat_attr_##_name = { \ .store = _store, \ }; -#define BAT_ATTR_STORE_BOOL(_name, _post_func) \ +#define BAT_ATTR_SIF_STORE_BOOL(_name, _post_func) \ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ char *buff, size_t count) \ { \ @@ -73,9 +73,9 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ &bat_priv->_name, net_dev); \ } -#define BAT_ATTR_SHOW_BOOL(_name) \ -ssize_t show_##_name(struct kobject *kobj, struct attribute *attr, \ - char *buff) \ +#define BAT_ATTR_SIF_SHOW_BOOL(_name) \ +ssize_t show_##_name(struct kobject *kobj, \ + struct attribute *attr, char *buff) \ { \ struct bat_priv *bat_priv = kobj_to_batpriv(kobj); \ return sprintf(buff, "%s\n", \ @@ -83,16 +83,17 @@ ssize_t show_##_name(struct kobject *kobj, struct attribute *attr, \ "disabled" : "enabled"); \ } \ -/* Use this, if you are going to turn a [name] in bat_priv on or off */ -#define BAT_ATTR_BOOL(_name, _mode, _post_func) \ - static BAT_ATTR_STORE_BOOL(_name, _post_func) \ - static BAT_ATTR_SHOW_BOOL(_name) \ +/* Use this, if you are going to turn a [name] in the soft-interface + * (bat_priv) on or off */ +#define BAT_ATTR_SIF_BOOL(_name, _mode, _post_func) \ + static BAT_ATTR_SIF_STORE_BOOL(_name, _post_func) \ + static BAT_ATTR_SIF_SHOW_BOOL(_name) \ static BAT_ATTR(_name, _mode, show_##_name, store_##_name) -#define BAT_ATTR_STORE_UINT(_name, _min, _max, _post_func) \ +#define BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ - char *buff, size_t count) \ + char *buff, size_t count) \ { \ struct net_device *net_dev = kobj_to_netdev(kobj); \ struct bat_priv *bat_priv = netdev_priv(net_dev); \ @@ -100,19 +101,19 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ attr, &bat_priv->_name, net_dev); \ } -#define BAT_ATTR_SHOW_UINT(_name) \ -ssize_t show_##_name(struct kobject *kobj, struct attribute *attr, \ - char *buff) \ +#define BAT_ATTR_SIF_SHOW_UINT(_name) \ +ssize_t show_##_name(struct kobject *kobj, \ + struct attribute *attr, char *buff) \ { \ struct bat_priv *bat_priv = kobj_to_batpriv(kobj); \ return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name)); \ } \ -/* Use this, if you are going to set [name] in bat_priv to unsigned integer - * values only */ -#define BAT_ATTR_UINT(_name, _mode, _min, _max, _post_func) \ - static BAT_ATTR_STORE_UINT(_name, _min, _max, _post_func) \ - static BAT_ATTR_SHOW_UINT(_name) \ +/* Use this, if you are going to set [name] in the soft-interface + * (bat_priv) to an unsigned integer value */ +#define BAT_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func) \ + static BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ + static BAT_ATTR_SIF_SHOW_UINT(_name) \ static BAT_ATTR(_name, _mode, show_##_name, store_##_name) @@ -384,24 +385,24 @@ static ssize_t store_gw_bwidth(struct kobject *kobj, struct attribute *attr, return gw_bandwidth_set(net_dev, buff, count); } -BAT_ATTR_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL); -BAT_ATTR_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); +BAT_ATTR_SIF_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL); +BAT_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); #ifdef CONFIG_BATMAN_ADV_BLA -BAT_ATTR_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); +BAT_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); #endif -BAT_ATTR_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu); -BAT_ATTR_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); +BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu); +BAT_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode); static BAT_ATTR(routing_algo, S_IRUGO, show_bat_algo, NULL); static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, show_gw_mode, store_gw_mode); -BAT_ATTR_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL); -BAT_ATTR_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL); -BAT_ATTR_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE, - post_gw_deselect); +BAT_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL); +BAT_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL); +BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE, + post_gw_deselect); static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth, store_gw_bwidth); #ifdef CONFIG_BATMAN_ADV_DEBUG -BAT_ATTR_UINT(log_level, S_IRUGO | S_IWUSR, 0, 15, NULL); +BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, 15, NULL); #endif static struct bat_attribute *mesh_attrs[] = { -- LinuxNextTracking

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge