iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'batadv-net-for-davem-20161026' of git://git.open-mesh.org/linux-merge

Browse Source 
Simon Wunderlich says:

====================
Here are three batman-adv bugfix patches:

 - Fix RCU usage for neighbor list, by Sven Eckelmann

 - Fix BATADV_DBG_ALL loglevel to include TP Meter messages, by Sven Eckelmann

 - Fix possible splat when disabling an interface, by Linus Luessing
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2016-10-29 15:05:53 -04:00
parent e934f68485 9799c50372
commit ad60133909
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/batman-adv/hard-interface.c
View File

@@ -652,7 +652,6 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
batadv_softif_destroy_sysfs(hard_iface->soft_iface); batadv_softif_destroy_sysfs(hard_iface->soft_iface);
} }
hard_iface->soft_iface = NULL;
batadv_hardif_put(hard_iface); batadv_hardif_put(hard_iface);
out: out:

2
net/batman-adv/log.h
View File

@@ -63,7 +63,7 @@ enum batadv_dbg_level {
BATADV_DBG_NC = BIT(5), BATADV_DBG_NC = BIT(5),
BATADV_DBG_MCAST = BIT(6), BATADV_DBG_MCAST = BIT(6),
BATADV_DBG_TP_METER = BIT(7), BATADV_DBG_TP_METER = BIT(7),
BATADV_DBG_ALL = 127, BATADV_DBG_ALL = 255,
}; };
#ifdef CONFIG_BATMAN_ADV_DEBUG #ifdef CONFIG_BATMAN_ADV_DEBUG

2
net/batman-adv/originator.c
View File

@@ -544,7 +544,7 @@ batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface,
if (bat_priv->algo_ops->neigh.hardif_init) if (bat_priv->algo_ops->neigh.hardif_init)
bat_priv->algo_ops->neigh.hardif_init(hardif_neigh); bat_priv->algo_ops->neigh.hardif_init(hardif_neigh);
hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list); hlist_add_head_rcu(&hardif_neigh->list, &hard_iface->neigh_list);
out: out:
spin_unlock_bh(&hard_iface->neigh_list_lock); spin_unlock_bh(&hard_iface->neigh_list_lock);