[linux-merge]; branch, merge/master, updated. v4.1-rc4-3317-g7efa6e7 - commits - lists.open-mesh.org

24 Aug 2015

The following commit has been merged in the merge/master branch:
commit 2535f8c4329f833054d3856156e9460efb66988b
Merge: 768323e2eacb5c9bf3b45557a648619ce3c71fc7 7f220ed1f063be00833bd34a013c8f3f45884031
Author: Marek Lindner mareklindner@neomailbox.ch
Date:   Wed Jun 17 18:49:53 2015 +0800
Merge branch 'maint' into next
diff --combined net/batman-adv/distributed-arp-table.c
index 6d0b471,b2cc19b..b9312bc

--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@@ -15,36 -15,18 +15,36 @@@
   * along with this program; if not, see http://www.gnu.org/licenses/.
   */
-#include <linux/if_ether.h>
 +#include "distributed-arp-table.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_arp.h>
 +#include <linux/if_ether.h>
  #include <linux/if_vlan.h>
 +#include <linux/in.h>
 +#include <linux/jiffies.h>
 +#include <linux/kernel.h>
 +#include <linux/list.h>
 +#include <linux/rculist.h>
 +#include <linux/rcupdate.h>
 +#include <linux/seq_file.h>
 +#include <linux/skbuff.h>
 +#include <linux/slab.h>
 +#include <linux/spinlock.h>
 +#include <linux/stddef.h>
 +#include <linux/string.h>
 +#include <linux/workqueue.h>
  #include <net/arp.h>
-#include "main.h"
 -#include "hash.h"
 -#include "distributed-arp-table.h"
  #include "hard-interface.h"
 +#include "hash.h"
  #include "originator.h"
  #include "send.h"
 -#include "types.h"
  #include "translation-table.h"
static void batadv_dat_purge(struct work_struct *work);
@@@ -224,22 -206,9 +224,22 @@@ static uint32_t batadv_hash_dat(const v
  {
    uint32_t hash = 0;
    const struct batadv_dat_entry *dat = data;
 +	const unsigned char *key;
 +	uint32_t i;
-	hash = batadv_hash_bytes(hash, &dat->ip, sizeof(dat->ip));
 -	hash = batadv_hash_bytes(hash, &dat->vid, sizeof(dat->vid));
 +	key = (const unsigned char *)&dat->ip;
 +	for (i = 0; i < sizeof(dat->ip); i++) {
 +		hash += key[i];
 +		hash += (hash << 10);
 +		hash ^= (hash >> 6);
 +	}
 +
 +	key = (const unsigned char *)&dat->vid;
 +	for (i = 0; i < sizeof(dat->vid); i++) {
 +		hash += key[i];
 +		hash += (hash << 10);
 +		hash ^= (hash >> 6);
 +	}
hash += (hash << 3);
    hash ^= (hash >> 11);
@@@ -713,9 -682,9 +713,9 @@@ static void batadv_dat_tvlv_ogm_handler
    				   uint16_t tvlv_value_len)
  {
    if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
- 		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_DAT;
+ 		clear_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
    else
- 		orig->capabilities |= BATADV_ORIG_CAPA_HAS_DAT;
+ 		set_bit(BATADV_ORIG_CAPA_HAS_DAT, &orig->capabilities);
  }
/**
diff --combined net/batman-adv/multicast.c
index 7aa480b,b75bcc3..9e2a853
--- 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"
/**
@@@ -588,19 -565,26 +588,26 @@@ batadv_mcast_forw_mode(struct batadv_pr
   *
   * If the BATADV_MCAST_WANT_ALL_UNSNOOPABLES flag of this originator,
   * orig, has toggled then this method updates counter and list accordingly.
+  *
+  * Caller needs to hold orig->mcast_handler_lock.
   */
  static void batadv_mcast_want_unsnoop_update(struct batadv_priv *bat_priv,
    				     struct batadv_orig_node *orig,
    				     uint8_t mcast_flags)
  {
+ 	struct hlist_node *node = &orig->mcast_want_all_unsnoopables_node;
+ 	struct hlist_head *head = &bat_priv->mcast.want_all_unsnoopables_list;
+ 
    /* switched from flag unset to set */
    if (mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES &&
        !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES)) {
    	atomic_inc(&bat_priv->mcast.num_want_all_unsnoopables);
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
- 		hlist_add_head_rcu(&orig->mcast_want_all_unsnoopables_node,
- 				   &bat_priv->mcast.want_all_unsnoopables_list);
+ 		/* flag checks above + mcast_handler_lock prevents this */
+ 		BUG_ON(!hlist_unhashed(node));
+ 
+ 		hlist_add_head_rcu(node, head);
    	spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
    /* switched from flag set to unset */
    } else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES) &&
@@@ -608,7 -592,10 +615,10 @@@
    	atomic_dec(&bat_priv->mcast.num_want_all_unsnoopables);
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
- 		hlist_del_rcu(&orig->mcast_want_all_unsnoopables_node);
+ 		/* flag checks above + mcast_handler_lock prevents this */
+ 		BUG_ON(hlist_unhashed(node));
+ 
+ 		hlist_del_init_rcu(node);
    	spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
    }
  }
@@@ -621,19 -608,26 +631,26 @@@
   *
   * If the BATADV_MCAST_WANT_ALL_IPV4 flag of this originator, orig, has
   * toggled then this method updates counter and list accordingly.
+  *
+  * Caller needs to hold orig->mcast_handler_lock.
   */
  static void batadv_mcast_want_ipv4_update(struct batadv_priv *bat_priv,
    				  struct batadv_orig_node *orig,
    				  uint8_t mcast_flags)
  {
+ 	struct hlist_node *node = &orig->mcast_want_all_ipv4_node;
+ 	struct hlist_head *head = &bat_priv->mcast.want_all_ipv4_list;
+ 
    /* switched from flag unset to set */
    if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV4 &&
        !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV4)) {
    	atomic_inc(&bat_priv->mcast.num_want_all_ipv4);
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
- 		hlist_add_head_rcu(&orig->mcast_want_all_ipv4_node,
- 				   &bat_priv->mcast.want_all_ipv4_list);
+ 		/* flag checks above + mcast_handler_lock prevents this */
+ 		BUG_ON(!hlist_unhashed(node));
+ 
+ 		hlist_add_head_rcu(node, head);
    	spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
    /* switched from flag set to unset */
    } else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_IPV4) &&
@@@ -641,7 -635,10 +658,10 @@@
    	atomic_dec(&bat_priv->mcast.num_want_all_ipv4);
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
- 		hlist_del_rcu(&orig->mcast_want_all_ipv4_node);
+ 		/* flag checks above + mcast_handler_lock prevents this */
+ 		BUG_ON(hlist_unhashed(node));
+ 
+ 		hlist_del_init_rcu(node);
    	spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
    }
  }
@@@ -654,19 -651,26 +674,26 @@@
   *
   * If the BATADV_MCAST_WANT_ALL_IPV6 flag of this originator, orig, has
   * toggled then this method updates counter and list accordingly.
+  *
+  * Caller needs to hold orig->mcast_handler_lock.
   */
  static void batadv_mcast_want_ipv6_update(struct batadv_priv *bat_priv,
    				  struct batadv_orig_node *orig,
    				  uint8_t mcast_flags)
  {
+ 	struct hlist_node *node = &orig->mcast_want_all_ipv6_node;
+ 	struct hlist_head *head = &bat_priv->mcast.want_all_ipv6_list;
+ 
    /* switched from flag unset to set */
    if (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6 &&
        !(orig->mcast_flags & BATADV_MCAST_WANT_ALL_IPV6)) {
    	atomic_inc(&bat_priv->mcast.num_want_all_ipv6);
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
- 		hlist_add_head_rcu(&orig->mcast_want_all_ipv6_node,
- 				   &bat_priv->mcast.want_all_ipv6_list);
+ 		/* flag checks above + mcast_handler_lock prevents this */
+ 		BUG_ON(!hlist_unhashed(node));
+ 
+ 		hlist_add_head_rcu(node, head);
    	spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
    /* switched from flag set to unset */
    } else if (!(mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) &&
@@@ -674,7 -678,10 +701,10 @@@
    	atomic_dec(&bat_priv->mcast.num_want_all_ipv6);
spin_lock_bh(&bat_priv->mcast.want_lists_lock);
- 		hlist_del_rcu(&orig->mcast_want_all_ipv6_node);
+ 		/* flag checks above + mcast_handler_lock prevents this */
+ 		BUG_ON(hlist_unhashed(node));
+ 
+ 		hlist_del_init_rcu(node);
    	spin_unlock_bh(&bat_priv->mcast.want_lists_lock);
    }
  }
@@@ -697,6 -704,11 +727,11 @@@ static void batadv_mcast_tvlv_ogm_handl
    uint8_t mcast_flags = BATADV_NO_FLAGS;
    bool orig_initialized;
+ 	if (orig_mcast_enabled && tvlv_value &&
+ 	    (tvlv_value_len >= sizeof(mcast_flags)))
+ 		mcast_flags = *(uint8_t *)tvlv_value;
+ 
+ 	spin_lock_bh(&orig->mcast_handler_lock);
    orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST;
/* If mcast support is turned on decrease the disabled mcast node
@@@ -707,7 -719,7 +742,7 @@@
        !(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) {
    	if (orig_initialized)
    		atomic_dec(&bat_priv->mcast.num_disabled);
- 		orig->capabilities |= BATADV_ORIG_CAPA_HAS_MCAST;
+ 		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
    /* If mcast support is being switched off or if this is an initial
     * OGM without mcast support then increase the disabled mcast
     * node counter.
@@@ -716,20 -728,17 +751,17 @@@
    	   (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST ||
    	    !orig_initialized)) {
    	atomic_inc(&bat_priv->mcast.num_disabled);
- 		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_MCAST;
+ 		clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);
    }
- 	orig->capa_initialized |= BATADV_ORIG_CAPA_HAS_MCAST;
- 
- 	if (orig_mcast_enabled && tvlv_value &&
- 	    (tvlv_value_len >= sizeof(mcast_flags)))
- 		mcast_flags = *(uint8_t *)tvlv_value;
+ 	set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized);
batadv_mcast_want_unsnoop_update(bat_priv, orig, mcast_flags);
    batadv_mcast_want_ipv4_update(bat_priv, orig, mcast_flags);
    batadv_mcast_want_ipv6_update(bat_priv, orig, mcast_flags);
orig->mcast_flags = mcast_flags;
+ 	spin_unlock_bh(&orig->mcast_handler_lock);
  }
/**
@@@ -763,6 -772,8 +795,8 @@@ void batadv_mcast_purge_orig(struct bat
  {
    struct batadv_priv *bat_priv = orig->bat_priv;
+ 	spin_lock_bh(&orig->mcast_handler_lock);
+ 
    if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
        orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
    	atomic_dec(&bat_priv->mcast.num_disabled);
@@@ -770,4 -781,6 +804,6 @@@
    batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);
    batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);
    batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);
+ 
+ 	spin_unlock_bh(&orig->mcast_handler_lock);
  }
diff --combined net/batman-adv/network-coding.c
index f0a50f3,3ce493e..1686d19
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@@ -15,44 -15,15 +15,44 @@@
   * along with this program; if not, see http://www.gnu.org/licenses/.
   */
+#include "network-coding.h"
 +#include "main.h"
 +
 +#include <linux/atomic.h>
 +#include <linux/byteorder/generic.h>
 +#include <linux/compiler.h>
  #include <linux/debugfs.h>
 +#include <linux/errno.h>
 +#include <linux/etherdevice.h>
 +#include <linux/fs.h>
 +#include <linux/if_ether.h>
 +#include <linux/if_packet.h>
 +#include <linux/init.h>
 +#include <linux/jhash.h>
 +#include <linux/jiffies.h>
 +#include <linux/kernel.h>
 +#include <linux/list.h>
 +#include <linux/lockdep.h>
 +#include <linux/netdevice.h>
 +#include <linux/printk.h>
 +#include <linux/random.h>
 +#include <linux/rculist.h>
 +#include <linux/rcupdate.h>
 +#include <linux/seq_file.h>
 +#include <linux/skbuff.h>
 +#include <linux/slab.h>
 +#include <linux/spinlock.h>
 +#include <linux/stat.h>
 +#include <linux/stddef.h>
 +#include <linux/string.h>
 +#include <linux/workqueue.h>
-#include "main.h"
 +#include "hard-interface.h"
  #include "hash.h"
 -#include "network-coding.h"
 -#include "send.h"
  #include "originator.h"
 -#include "hard-interface.h"
 +#include "packet.h"
  #include "routing.h"
 +#include "send.h"
static struct lock_class_key batadv_nc_coding_hash_lock_class_key;
  static struct lock_class_key batadv_nc_decoding_hash_lock_class_key;
@@@ -134,9 -105,9 +134,9 @@@ static void batadv_nc_tvlv_ogm_handler_
    				  uint16_t tvlv_value_len)
  {
    if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND)
- 		orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_NC;
+ 		clear_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
    else
- 		orig->capabilities |= BATADV_ORIG_CAPA_HAS_NC;
+ 		set_bit(BATADV_ORIG_CAPA_HAS_NC, &orig->capabilities);
  }
/**
@@@ -184,7 -155,7 +184,7 @@@ err
   */
  void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv)
  {
 -	atomic_set(&bat_priv->network_coding, 1);
 +	atomic_set(&bat_priv->network_coding, 0);
    bat_priv->nc.min_tq = 200;
    bat_priv->nc.max_fwd_delay = 10;
    bat_priv->nc.max_buffer_time = 200;
@@@ -304,7 -275,7 +304,7 @@@ static bool batadv_nc_to_purge_nc_path_
     * max_buffer time
     */
    return batadv_has_timed_out(nc_path->last_valid,
 -				    bat_priv->nc.max_buffer_time*10);
 +				    bat_priv->nc.max_buffer_time * 10);
  }
/**
@@@ -482,8 -453,14 +482,8 @@@ static uint32_t batadv_nc_hash_choose(c
    const struct batadv_nc_path *nc_path = data;
    uint32_t hash = 0;
-	hash = batadv_hash_bytes(hash, &nc_path->prev_hop,
 -				 sizeof(nc_path->prev_hop));
 -	hash = batadv_hash_bytes(hash, &nc_path->next_hop,
 -				 sizeof(nc_path->next_hop));
 -
 -	hash += (hash << 3);
 -	hash ^= (hash >> 11);
 -	hash += (hash << 15);
 +	hash = jhash(&nc_path->prev_hop, sizeof(nc_path->prev_hop), hash);
 +	hash = jhash(&nc_path->next_hop, sizeof(nc_path->next_hop), hash);
return hash % size;
  }
diff --combined net/batman-adv/originator.c
index 018b749,a2ba182..78243d8
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@@ -15,31 -15,19 +15,31 @@@
   * along with this program; if not, see http://www.gnu.org/licenses/.
   */
+#include "originator.h"
  #include "main.h"
 +
 +#include <linux/errno.h>
 +#include <linux/etherdevice.h>
 +#include <linux/fs.h>
 +#include <linux/jiffies.h>
 +#include <linux/kernel.h>
 +#include <linux/list.h>
 +#include <linux/lockdep.h>
 +#include <linux/netdevice.h>
 +#include <linux/seq_file.h>
 +#include <linux/slab.h>
 +#include <linux/spinlock.h>
 +#include <linux/workqueue.h>
 +
  #include "distributed-arp-table.h"
 -#include "originator.h"
 -#include "hash.h"
 -#include "translation-table.h"
 -#include "routing.h"
 +#include "fragmentation.h"
  #include "gateway_client.h"
  #include "hard-interface.h"
 -#include "soft-interface.h"
 -#include "bridge_loop_avoidance.h"
 -#include "network-coding.h"
 -#include "fragmentation.h"
 +#include "hash.h"
  #include "multicast.h"
 +#include "network-coding.h"
 +#include "routing.h"
 +#include "translation-table.h"
/* hash class keys */
  static struct lock_class_key batadv_orig_hash_lock_class_key;
@@@ -209,19 -197,13 +209,19 @@@ static void batadv_neigh_node_free_rcu(
    struct hlist_node *node_tmp;
    struct batadv_neigh_node *neigh_node;
    struct batadv_neigh_ifinfo *neigh_ifinfo;
 +	struct batadv_algo_ops *bao;
neigh_node = container_of(rcu, struct batadv_neigh_node, rcu);
 +	bao = neigh_node->orig_node->bat_priv->bat_algo_ops;
hlist_for_each_entry_safe(neigh_ifinfo, node_tmp,
    			  &neigh_node->ifinfo_list, list) {
    	batadv_neigh_ifinfo_free_ref_now(neigh_ifinfo);
    }
 +
 +	if (bao->bat_neigh_free)
 +		bao->bat_neigh_free(neigh_node);
 +
    batadv_hardif_free_ref_now(neigh_node->if_incoming);
kfree(neigh_node);
@@@ -676,11 -658,15 +676,15 @@@ struct batadv_orig_node *batadv_orig_no
    INIT_HLIST_HEAD(&orig_node->neigh_list);
    INIT_LIST_HEAD(&orig_node->vlan_list);
    INIT_HLIST_HEAD(&orig_node->ifinfo_list);
+ 	INIT_HLIST_NODE(&orig_node->mcast_want_all_unsnoopables_node);
+ 	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv4_node);
+ 	INIT_HLIST_NODE(&orig_node->mcast_want_all_ipv6_node);
    spin_lock_init(&orig_node->bcast_seqno_lock);
    spin_lock_init(&orig_node->neigh_list_lock);
    spin_lock_init(&orig_node->tt_buff_lock);
    spin_lock_init(&orig_node->tt_lock);
    spin_lock_init(&orig_node->vlan_list_lock);
+ 	spin_lock_init(&orig_node->mcast_handler_lock);
batadv_nc_init_orig(orig_node);
diff --combined net/batman-adv/translation-table.c
index b482495,e95a424..f1fa1b7
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -15,41 -15,18 +15,41 @@@
   * along with this program; if not, see http://www.gnu.org/licenses/.
   */
-#include "main.h"
  #include "translation-table.h"
 -#include "soft-interface.h"
 +#include "main.h"
 +
 +#include <linux/atomic.h>
 +#include <linux/bug.h>
 +#include <linux/byteorder/generic.h>
 +#include <linux/compiler.h>
 +#include <linux/crc32c.h>
 +#include <linux/errno.h>
 +#include <linux/etherdevice.h>
 +#include <linux/fs.h>
 +#include <linux/if_ether.h>
 +#include <linux/jhash.h>
 +#include <linux/jiffies.h>
 +#include <linux/kernel.h>
 +#include <linux/list.h>
 +#include <linux/lockdep.h>
 +#include <linux/netdevice.h>
 +#include <linux/rculist.h>
 +#include <linux/rcupdate.h>
 +#include <linux/seq_file.h>
 +#include <linux/slab.h>
 +#include <linux/spinlock.h>
 +#include <linux/stddef.h>
 +#include <linux/string.h>
 +#include <linux/workqueue.h>
 +#include <net/net_namespace.h>
 +
 +#include "bridge_loop_avoidance.h"
  #include "hard-interface.h"
 -#include "send.h"
  #include "hash.h"
 -#include "originator.h"
 -#include "routing.h"
 -#include "bridge_loop_avoidance.h"
  #include "multicast.h"
 -
 -#include <linux/crc32c.h>
 +#include "originator.h"
 +#include "packet.h"
 +#include "soft-interface.h"
/* hash class keys */
  static struct lock_class_key batadv_tt_local_hash_lock_class_key;
@@@ -90,8 -67,12 +90,8 @@@ static inline uint32_t batadv_choose_tt
    uint32_t hash = 0;
tt = (struct batadv_tt_common_entry *)data;
 -	hash = batadv_hash_bytes(hash, &tt->addr, ETH_ALEN);
 -	hash = batadv_hash_bytes(hash, &tt->vid, sizeof(tt->vid));
 -
 -	hash += (hash << 3);
 -	hash ^= (hash >> 11);
 -	hash += (hash << 15);
 +	hash = jhash(&tt->addr, ETH_ALEN, hash);
 +	hash = jhash(&tt->vid, sizeof(tt->vid), hash);
return hash % size;
  }
@@@ -973,17 -954,17 +973,17 @@@ int batadv_tt_local_seq_print_text(stru
    			   " * %pM %4i [%c%c%c%c%c%c] %3u.%03u   (%#.8x)\n",
    			   tt_common_entry->addr,
    			   BATADV_PRINT_VID(tt_common_entry->vid),
 -				   (tt_common_entry->flags &
 -				    BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
 +				   ((tt_common_entry->flags &
 +				     BATADV_TT_CLIENT_ROAM) ? 'R' : '.'),
    			   no_purge ? 'P' : '.',
 -				   (tt_common_entry->flags &
 -				    BATADV_TT_CLIENT_NEW ? 'N' : '.'),
 -				   (tt_common_entry->flags &
 -				    BATADV_TT_CLIENT_PENDING ? 'X' : '.'),
 -				   (tt_common_entry->flags &
 -				    BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
 -				   (tt_common_entry->flags &
 -				    BATADV_TT_CLIENT_ISOLA ? 'I' : '.'),
 +				   ((tt_common_entry->flags &
 +				     BATADV_TT_CLIENT_NEW) ? 'N' : '.'),
 +				   ((tt_common_entry->flags &
 +				     BATADV_TT_CLIENT_PENDING) ? 'X' : '.'),
 +				   ((tt_common_entry->flags &
 +				     BATADV_TT_CLIENT_WIFI) ? 'W' : '.'),
 +				   ((tt_common_entry->flags &
 +				     BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),
    			   no_purge ? 0 : last_seen_secs,
    			   no_purge ? 0 : last_seen_msecs,
    			   vlan->tt.crc);
@@@ -1547,10 -1528,10 +1547,10 @@@ batadv_tt_global_print_entry(struct bat
    		   BATADV_PRINT_VID(tt_global_entry->common.vid),
    		   best_entry->ttvn, best_entry->orig_node->orig,
    		   last_ttvn, vlan->tt.crc,
 -			   (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
 -			   (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
 -			   (flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'),
 -			   (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.'));
 +			   ((flags & BATADV_TT_CLIENT_ROAM) ? 'R' : '.'),
 +			   ((flags & BATADV_TT_CLIENT_WIFI) ? 'W' : '.'),
 +			   ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),
 +			   ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));
batadv_orig_node_vlan_free_ref(vlan);
    }
@@@ -1579,10 -1560,10 +1579,10 @@@ print_list
    		   BATADV_PRINT_VID(tt_global_entry->common.vid),
    		   orig_entry->ttvn, orig_entry->orig_node->orig,
    		   last_ttvn, vlan->tt.crc,
 -			   (flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'),
 -			   (flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'),
 -			   (flags & BATADV_TT_CLIENT_ISOLA ? 'I' : '.'),
 -			   (flags & BATADV_TT_CLIENT_TEMP ? 'T' : '.'));
 +			   ((flags & BATADV_TT_CLIENT_ROAM) ? 'R' : '.'),
 +			   ((flags & BATADV_TT_CLIENT_WIFI) ? 'W' : '.'),
 +			   ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),
 +			   ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));
batadv_orig_node_vlan_free_ref(vlan);
    }
@@@ -1862,7 -1843,7 +1862,7 @@@ void batadv_tt_global_del_orig(struct b
    	}
    	spin_unlock_bh(list_lock);
    }
- 	orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TT;
+ 	clear_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
  }
static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global,
@@@ -2548,7 -2529,7 +2548,7 @@@ static bool batadv_send_other_tt_respon
    batadv_dbg(BATADV_DBG_TT, bat_priv,
    	   "Received TT_REQUEST from %pM for ttvn: %u (%pM) [%c]\n",
    	   req_src, tt_data->ttvn, req_dst,
 -		   (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 +		   ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.'));
/* Let's get the orig node of the REAL destination */
    req_dst_orig_node = batadv_orig_hash_find(bat_priv, req_dst);
@@@ -2679,7 -2660,7 +2679,7 @@@ static bool batadv_send_my_tt_response(
    batadv_dbg(BATADV_DBG_TT, bat_priv,
    	   "Received TT_REQUEST from %pM for ttvn: %u (me) [%c]\n",
    	   req_src, tt_data->ttvn,
 -		   (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 +		   ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.'));
spin_lock_bh(&bat_priv->tt.commit_lock);
@@@ -2821,7 -2802,7 +2821,7 @@@ static void _batadv_tt_update_changes(s
    			return;
    	}
    }
- 	orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TT;
+ 	set_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
  }
static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
@@@ -2918,7 -2899,7 +2918,7 @@@ static void batadv_handle_tt_response(s
    batadv_dbg(BATADV_DBG_TT, bat_priv,
    	   "Received TT_RESPONSE from %pM for ttvn %d t_size: %d [%c]\n",
    	   resp_src, tt_data->ttvn, num_entries,
 -		   (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.'));
 +		   ((tt_data->flags & BATADV_TT_FULL_TABLE) ? 'F' : '.'));
orig_node = batadv_orig_hash_find(bat_priv, resp_src);
    if (!orig_node)
diff --combined net/batman-adv/types.h
index 67d6348,65dc6bf..d587a53
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@@ -18,23 -18,9 +18,23 @@@
  #ifndef _NET_BATMAN_ADV_TYPES_H_
  #define _NET_BATMAN_ADV_TYPES_H_
+#ifndef _NET_BATMAN_ADV_MAIN_H_
 +#error only "main.h" can be included directly
 +#endif
 +
 +#include <linux/bitops.h>
 +#include <linux/compiler.h>
 +#include <linux/if_ether.h>
 +#include <linux/netdevice.h>
 +#include <linux/sched.h> /* for linux/wait.h */
 +#include <linux/spinlock.h>
 +#include <linux/types.h>
 +#include <linux/wait.h>
 +#include <linux/workqueue.h>
 +
  #include "packet.h"
 -#include "bitarray.h"
 -#include <linux/kernel.h>
 +
 +struct seq_file;
#ifdef CONFIG_BATMAN_ADV_DAT
@@@ -146,7 -132,6 +146,7 @@@ struct batadv_orig_ifinfo 
   * @timestamp: time (jiffie) of last received fragment
   * @seqno: sequence number of the fragments in the list
   * @size: accumulated size of packets in list
 + * @total_size: expected size of the assembled packet
   */
  struct batadv_frag_table_entry {
    struct hlist_head head;
@@@ -154,7 -139,6 +154,7 @@@
    unsigned long timestamp;
    uint16_t seqno;
    uint16_t size;
 +	uint16_t total_size;
  };
/**
@@@ -197,10 -181,9 +197,10 @@@ struct batadv_orig_node_vlan
/**
   * struct batadv_orig_bat_iv - B.A.T.M.A.N. IV private orig_node members
 - * @bcast_own: bitfield containing the number of our OGMs this orig_node
 - *  rebroadcasted "back" to us (relative to last_real_seqno)
 - * @bcast_own_sum: counted result of bcast_own
 + * @bcast_own: set of bitfields (one per hard interface) where each one counts
 + * the number of our OGMs this orig_node rebroadcasted "back" to us  (relative
 + * to last_real_seqno). Every bitfield is BATADV_TQ_LOCAL_WINDOW_SIZE bits long.
 + * @bcast_own_sum: sum of bcast_own
   * @ogm_cnt_lock: lock protecting bcast_own, bcast_own_sum,
   *  neigh_node->bat_iv.real_bits & neigh_node->bat_iv.real_packet_count
   */
@@@ -221,6 -204,7 +221,7 @@@ struct batadv_orig_bat_iv 
   * @batadv_dat_addr_t:  address of the orig node in the distributed hash
   * @last_seen: time when last packet from this node was received
   * @bcast_seqno_reset: time when the broadcast seqno window was reset
+  * @mcast_handler_lock: synchronizes mcast-capability and -flag changes
   * @mcast_flags: multicast flags announced by the orig node
   * @mcast_want_all_unsnoop_node: a list node for the
   *  mcast.want_all_unsnoopables list
@@@ -268,13 -252,15 +269,15 @@@ struct batadv_orig_node 
    unsigned long last_seen;
    unsigned long bcast_seqno_reset;
  #ifdef CONFIG_BATMAN_ADV_MCAST
+ 	/* synchronizes mcast tvlv specific orig changes */
+ 	spinlock_t mcast_handler_lock;
    uint8_t mcast_flags;
    struct hlist_node mcast_want_all_unsnoopables_node;
    struct hlist_node mcast_want_all_ipv4_node;
    struct hlist_node mcast_want_all_ipv6_node;
  #endif
- 	uint8_t capabilities;
- 	uint8_t capa_initialized;
+ 	unsigned long capabilities;
+ 	unsigned long capa_initialized;
    atomic_t last_ttvn;
    unsigned char *tt_buff;
    int16_t tt_buff_len;
@@@ -1135,8 -1121,6 +1138,8 @@@ struct batadv_forw_packet 
   * @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or better
   *  than neigh2 for their respective outgoing interface from the metric
   *  prospective
 + * @bat_neigh_free: free the resources allocated by the routing algorithm for a
 + *  neigh_node object
   * @bat_orig_print: print the originator table (optional)
   * @bat_orig_free: free the resources allocated by the routing algorithm for an
   *  orig_node object
@@@ -1154,7 -1138,6 +1157,7 @@@ struct batadv_algo_ops 
    void (*bat_primary_iface_set)(struct batadv_hard_iface *hard_iface);
    void (*bat_ogm_schedule)(struct batadv_hard_iface *hard_iface);
    void (*bat_ogm_emit)(struct batadv_forw_packet *forw_packet);
 +	/* neigh_node handling API */
    int (*bat_neigh_cmp)(struct batadv_neigh_node *neigh1,
    		     struct batadv_hard_iface *if_outgoing1,
    		     struct batadv_neigh_node *neigh2,
@@@ -1164,7 -1147,6 +1167,7 @@@
    	 struct batadv_hard_iface *if_outgoing1,
    	 struct batadv_neigh_node *neigh2,
    	 struct batadv_hard_iface *if_outgoing2);
 +	void (*bat_neigh_free)(struct batadv_neigh_node *neigh);
    /* orig_node handling API */
    void (*bat_orig_print)(struct batadv_priv *priv, struct seq_file *seq,
    		       struct batadv_hard_iface *hard_iface);
-- 


    