Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
commit 04376241f586e8e49753b4372611c2d076624756 Merge: 6846ad8 b307e72 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Sep 13 18:22:15 2015 +0800
Merge branch 'maint' into next
04376241f586e8e49753b4372611c2d076624756 net/batman-adv/bridge_loop_avoidance.c | 35 +++++++++++++++++++++++++++++----- net/batman-adv/types.h | 2 ++ 2 files changed, 32 insertions(+), 5 deletions(-)
diff --cc net/batman-adv/bridge_loop_avoidance.c index 191a702,c95268b..99dcae3 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -660,11 -670,12 +671,11 @@@ static void batadv_bla_del_claim(struc }
/* check for ANNOUNCE frame, return 1 if handled */ -static int batadv_handle_announce(struct batadv_priv *bat_priv, - uint8_t *an_addr, uint8_t *backbone_addr, - unsigned short vid) +static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, + u8 *backbone_addr, unsigned short vid) { struct batadv_bla_backbone_gw *backbone_gw; - u16 crc; - uint16_t backbone_crc, crc; ++ u16 backbone_crc, crc;
if (memcmp(an_addr, batadv_announce_mac, 4) != 0) return 0; @@@ -1647,9 -1662,10 +1662,10 @@@ int batadv_bla_claim_table_seq_print_te struct batadv_bla_claim *claim; struct batadv_hard_iface *primary_if; struct hlist_head *head; - uint16_t backbone_crc; - uint32_t i; ++ u16 backbone_crc; + u32 i; bool is_own; - uint8_t *primary_addr; + u8 *primary_addr;
primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) @@@ -1692,9 -1712,10 +1712,10 @@@ int batadv_bla_backbone_table_seq_print struct batadv_hard_iface *primary_if; struct hlist_head *head; int secs, msecs; - uint16_t backbone_crc; - uint32_t i; ++ u16 backbone_crc; + u32 i; bool is_own; - uint8_t *primary_addr; + u8 *primary_addr;
primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) diff --cc net/batman-adv/types.h index d260efd,bd4ed75..1170962 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -896,7 -899,8 +897,8 @@@ struct batadv_bla_backbone_gw unsigned long lasttime; atomic_t wait_periods; atomic_t request_sent; - uint16_t crc; + u16 crc; + spinlock_t crc_lock; /* protects crc */ atomic_t refcount; struct rcu_head rcu; };