summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/unicast.c
diff options
context:
space:
mode:
authorSimon Wunderlich <siwu@hrz.tu-chemnitz.de>2011-01-19 21:01:43 +0100
committerMarek Lindner <lindner_marek@yahoo.de>2011-03-05 12:50:01 +0100
commita4c135c561106c397bae33455acfca4aa8065a30 (patch)
tree09613dd5443fb6abfdab5b851eccdd610d1b0783 /net/batman-adv/unicast.c
parentbatman-adv: protect ogm counter arrays with spinlock (diff)
downloadlinux-a4c135c561106c397bae33455acfca4aa8065a30.tar.xz
linux-a4c135c561106c397bae33455acfca4aa8065a30.zip
batman-adv: protect bonding with rcu locks
bonding / alternating candidates need to be secured by rcu locks as well. This patch therefore converts the bonding list from a plain pointer list to a rcu securable lists and references the bonding candidates. Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/unicast.c')
-rw-r--r--net/batman-adv/unicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 4687027f1495..00bfeaf9ece3 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -299,6 +299,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
if (!orig_node)
orig_node = transtable_search(bat_priv, ethhdr->h_dest);
+ /* find_router() increases neigh_nodes refcount if found. */
router = find_router(bat_priv, orig_node, NULL);
if (!router)
@@ -306,7 +307,6 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
/* don't lock while sending the packets ... we therefore
* copy the required data before sending */
-
batman_if = router->if_incoming;
memcpy(dstaddr, router->addr, ETH_ALEN);