The following commit has been merged in the merge/master branch: commit 126c2f7a7c7d75ba85205d3c0756fd6ec0366c93 Merge: 8592db1918a00a5daeb4aab946b599204b15731a 7ad001a18d1a6e2fd19969fdd671efe99d75920f Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Jul 20 13:50:46 2015 +0800

Merge branch 'maint' into next

diff --combined net/batman-adv/multicast.c index deb51ad,417c3fa..8bdd69f --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@@ -15,33 -15,10 +15,33 @@@ * along with this program; if not, see http://www.gnu.org/licenses/. */

-#include "main.h" #include "multicast.h" -#include "originator.h" -#include "hard-interface.h" +#include "main.h" + +#include <linux/atomic.h> +#include <linux/byteorder/generic.h> +#include <linux/errno.h> +#include <linux/etherdevice.h> +#include <linux/fs.h> +#include <linux/if_ether.h> +#include <linux/in6.h> +#include <linux/in.h> +#include <linux/ip.h> +#include <linux/ipv6.h> +#include <linux/list.h> +#include <linux/netdevice.h> +#include <linux/rculist.h> +#include <linux/rcupdate.h> +#include <linux/skbuff.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/stddef.h> +#include <linux/string.h> +#include <linux/types.h> +#include <net/addrconf.h> +#include <net/ipv6.h> + +#include "packet.h" #include "translation-table.h"

/** @@@ -605,7 -582,7 +605,7 @@@ static void batadv_mcast_want_unsnoop_u

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(!hlist_unhashed(node)); + WARN_ON(!hlist_unhashed(node));

hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@@ -616,7 -593,7 +616,7 @@@

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(hlist_unhashed(node)); + WARN_ON(hlist_unhashed(node));

hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@@ -648,7 -625,7 +648,7 @@@ static void batadv_mcast_want_ipv4_upda

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(!hlist_unhashed(node)); + WARN_ON(!hlist_unhashed(node));

hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@@ -659,7 -636,7 +659,7 @@@

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(hlist_unhashed(node)); + WARN_ON(hlist_unhashed(node));

hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@@ -691,7 -668,7 +691,7 @@@ static void batadv_mcast_want_ipv6_upda

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(!hlist_unhashed(node)); + WARN_ON(!hlist_unhashed(node));

hlist_add_head_rcu(node, head); spin_unlock_bh(&bat_priv->mcast.want_lists_lock); @@@ -702,7 -679,7 +702,7 @@@

spin_lock_bh(&bat_priv->mcast.want_lists_lock); /* flag checks above + mcast_handler_lock prevents this */ - BUG_ON(hlist_unhashed(node)); + WARN_ON(hlist_unhashed(node));

hlist_del_init_rcu(node); spin_unlock_bh(&bat_priv->mcast.want_lists_lock);