[linux-merge]linux integration; branch, merge/master, updated. v3.9-rc1-1780-g048202d - commits - lists.open-mesh.org

22 Apr 2013

The following commit has been merged in the merge/master branch:
commit 048202d71c245271fe758755504ff875f547446f
Merge: 34dbd45c064773e647bbbddd25597eb408f16fe5 675fbb48d3b588caeee16d2e76b774b186e11f14
Author: Antonio Quartulli ordex@autistici.org
Date:   Sun Apr 21 12:51:37 2013 +0200
Merge remote-tracking branch 'pkg/next' into merge/master
Conflicts:
    	net/batman-adv/CHANGELOG
    	net/batman-adv/Makefile.kbuild
    	net/batman-adv/README.external
    	net/batman-adv/compat.h
diff --combined net/batman-adv/Makefile
index acbac2a,489bb36..489bb36

--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@@ -32,7 -32,6 +32,6 @@@ batman-adv-y += icmp_socket.
  batman-adv-y += main.o
  batman-adv-$(CONFIG_BATMAN_ADV_NC) += network-coding.o
  batman-adv-y += originator.o
- batman-adv-y += ring_buffer.o
  batman-adv-y += routing.o
  batman-adv-y += send.o
  batman-adv-y += soft-interface.o
diff --combined net/batman-adv/bat_iv_ogm.c
index 071f288,d07323b..d07323b
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@@ -19,7 -19,6 +19,6 @@@
#include "main.h"
  #include "translation-table.h"
- #include "ring_buffer.h"
  #include "originator.h"
  #include "routing.h"
  #include "gateway_common.h"
@@@ -29,16 -28,57 +28,57 @@@
  #include "bat_algo.h"
  #include "network-coding.h"
+ /**
+  * batadv_ring_buffer_set - update the ring buffer with the given value
+  * @lq_recv: pointer to the ring buffer
+  * @lq_index: index to store the value at
+  * @value: value to store in the ring buffer
+  */
+ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,
+ 				   uint8_t value)
+ {
+ 	lq_recv[*lq_index] = value;
+ 	*lq_index = (*lq_index + 1) % BATADV_TQ_GLOBAL_WINDOW_SIZE;
+ }
+ 
+ /**
+  * batadv_ring_buffer_set - compute the average of all non-zero values stored
+  * in the given ring buffer
+  * @lq_recv: pointer to the ring buffer
+  *
+  * Returns computed average value.
+  */
+ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])
+ {
+ 	const uint8_t *ptr;
+ 	uint16_t count = 0, i = 0, sum = 0;
+ 
+ 	ptr = lq_recv;
+ 
+ 	while (i < BATADV_TQ_GLOBAL_WINDOW_SIZE) {
+ 		if (*ptr != 0) {
+ 			count++;
+ 			sum += *ptr;
+ 		}
+ 
+ 		i++;
+ 		ptr++;
+ 	}
+ 
+ 	if (count == 0)
+ 		return 0;
+ 
+ 	return (uint8_t)(sum / count);
+ }
  static struct batadv_neigh_node *
  batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
    		const uint8_t *neigh_addr,
    		struct batadv_orig_node *orig_node,
- 			struct batadv_orig_node *orig_neigh, __be32 seqno)
+ 			struct batadv_orig_node *orig_neigh)
  {
    struct batadv_neigh_node *neigh_node;
- 	neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr,
- 					   ntohl(seqno));
+ 	neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr);
    if (!neigh_node)
    	goto out;
@@@ -413,18 -453,16 +453,16 @@@ static void batadv_iv_ogm_aggregate_new
    else
    	skb_size = packet_len;
- 	skb_size += ETH_HLEN + NET_IP_ALIGN;
+ 	skb_size += ETH_HLEN;
- 	forw_packet_aggr->skb = dev_alloc_skb(skb_size);
+ 	forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size);
    if (!forw_packet_aggr->skb) {
    	if (!own_packet)
    		atomic_inc(&bat_priv->batman_queue_left);
    	kfree(forw_packet_aggr);
    	goto out;
    }
- 	skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN);
- 
- 	INIT_HLIST_NODE(&forw_packet_aggr->list);
+ 	skb_reserve(forw_packet_aggr->skb, ETH_HLEN);
skb_buff = skb_put(forw_packet_aggr->skb, packet_len);
    forw_packet_aggr->packet_len = packet_len;
@@@ -590,6 -628,41 +628,41 @@@ static void batadv_iv_ogm_forward(struc
    			if_incoming, 0, batadv_iv_ogm_fwd_send_time());
  }
+ /**
+  * batadv_iv_ogm_slide_own_bcast_window - bitshift own OGM broadcast windows for
+  * the given interface
+  * @hard_iface: the interface for which the windows have to be shifted
+  */
+ static void
+ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)
+ {
+ 	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
+ 	struct batadv_hashtable *hash = bat_priv->orig_hash;
+ 	struct hlist_head *head;
+ 	struct batadv_orig_node *orig_node;
+ 	unsigned long *word;
+ 	uint32_t i;
+ 	size_t word_index;
+ 	uint8_t *w;
+ 
+ 	for (i = 0; i < hash->size; i++) {
+ 		head = &hash->table[i];
+ 
+ 		rcu_read_lock();
+ 		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
+ 			spin_lock_bh(&orig_node->ogm_cnt_lock);
+ 			word_index = hard_iface->if_num * BATADV_NUM_WORDS;
+ 			word = &(orig_node->bcast_own[word_index]);
+ 
+ 			batadv_bit_get_packet(bat_priv, word, 1, 0);
+ 			w = &orig_node->bcast_own_sum[hard_iface->if_num];
+ 			*w = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE);
+ 			spin_unlock_bh(&orig_node->ogm_cnt_lock);
+ 		}
+ 		rcu_read_unlock();
+ 	}
+ }
+ 
  static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
  {
    struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
@@@ -634,7 -707,7 +707,7 @@@
    	batadv_ogm_packet->gw_flags = BATADV_NO_FLAGS;
    }
- 	batadv_slide_own_bcast_window(hard_iface);
+ 	batadv_iv_ogm_slide_own_bcast_window(hard_iface);
    batadv_iv_ogm_queue_add(bat_priv, hard_iface->bat_iv.ogm_buff,
    			hard_iface->bat_iv.ogm_buff_len, hard_iface, 1,
    			batadv_iv_ogm_emit_send_time(bat_priv));
@@@ -670,7 -743,7 +743,7 @@@ batadv_iv_ogm_orig_update(struct batadv
    	if (batadv_compare_eth(neigh_addr, ethhdr->h_source) &&
    	    tmp_neigh_node->if_incoming == if_incoming &&
    	    atomic_inc_not_zero(&tmp_neigh_node->refcount)) {
- 			if (neigh_node)
+ 			if (WARN(neigh_node, "too many matching neigh_nodes"))
    			batadv_neigh_node_free_ref(neigh_node);
    		neigh_node = tmp_neigh_node;
    		continue;
@@@ -696,8 -769,7 +769,7 @@@
neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
    					     ethhdr->h_source,
- 						     orig_node, orig_tmp,
- 						     batadv_ogm_packet->seqno);
+ 						     orig_node, orig_tmp);
batadv_orig_node_free_ref(orig_tmp);
    	if (!neigh_node)
@@@ -829,8 -901,7 +901,7 @@@ static int batadv_iv_ogm_calc_tq(struc
    	neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
    					     orig_neigh_node->orig,
    					     orig_neigh_node,
- 						     orig_neigh_node,
- 						     batadv_ogm_packet->seqno);
+ 						     orig_neigh_node);
if (!neigh_node)
    	goto out;
@@@ -991,7 -1062,7 +1062,7 @@@ static void batadv_iv_ogm_process(cons
    struct batadv_neigh_node *orig_neigh_router = NULL;
    int has_directlink_flag;
    int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
- 	int is_broadcast = 0, is_bidirect;
+ 	int is_bidirect;
    bool is_single_hop_neigh = false;
    bool is_from_best_next_hop = false;
    int is_duplicate, sameseq, simlar_ttl;
@@@ -1054,19 -1125,9 +1125,9 @@@
    	if (batadv_compare_eth(batadv_ogm_packet->prev_sender,
    			       hard_iface->net_dev->dev_addr))
    		is_my_oldorig = 1;
    }
    rcu_read_unlock();
- 	if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {
- 		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
- 			   "Drop packet: incompatible batman version (%i)\n",
- 			   batadv_ogm_packet->header.version);
- 		return;
- 	}
- 
    if (is_my_addr) {
    	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
    		   "Drop packet: received my own broadcast (sender: %pM)\n",
@@@ -1074,13 -1135,6 +1135,6 @@@
    	return;
    }
- 	if (is_broadcast) {
- 		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
- 			   "Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n",
- 			   ethhdr->h_source);
- 		return;
- 	}
- 
    if (is_my_orig) {
    	unsigned long *word;
    	int offset;
@@@ -1288,7 -1342,7 +1342,7 @@@ static int batadv_iv_ogm_receive(struc
    		   skb->len + ETH_HLEN);
packet_len = skb_headlen(skb);
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
    packet_buff = skb->data;
    batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
diff --combined net/batman-adv/bridge_loop_avoidance.c
index 6a4f728,605c3ac..605c3ac
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@@ -180,7 -180,7 +180,7 @@@ static struct batadv_bla_clai
   */
  static struct batadv_bla_backbone_gw *
  batadv_backbone_hash_find(struct batadv_priv *bat_priv,
- 			  uint8_t *addr, short vid)
+ 			  uint8_t *addr, unsigned short vid)
  {
    struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;
    struct hlist_head *head;
@@@ -257,7 -257,7 +257,7 @@@ batadv_bla_del_backbone_claims(struct b
   * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)
   */
  static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac,
- 				  short vid, int claimtype)
+ 				  unsigned short vid, int claimtype)
  {
    struct sk_buff *skb;
    struct ethhdr *ethhdr;
@@@ -307,7 -307,8 +307,8 @@@
    	 */
    	memcpy(ethhdr->h_source, mac, ETH_ALEN);
    	batadv_dbg(BATADV_DBG_BLA, bat_priv,
- 			   "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid);
+ 			   "bla_send_claim(): CLAIM %pM on vid %d\n", mac,
+ 			   BATADV_PRINT_VID(vid));
    	break;
    case BATADV_CLAIM_TYPE_UNCLAIM:
    	/* unclaim frame
@@@ -316,7 -317,7 +317,7 @@@
    	memcpy(hw_src, mac, ETH_ALEN);
    	batadv_dbg(BATADV_DBG_BLA, bat_priv,
    		   "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,
- 			   vid);
+ 			   BATADV_PRINT_VID(vid));
    	break;
    case BATADV_CLAIM_TYPE_ANNOUNCE:
    	/* announcement frame
@@@ -325,7 -326,7 +326,7 @@@
    	memcpy(hw_src, mac, ETH_ALEN);
    	batadv_dbg(BATADV_DBG_BLA, bat_priv,
    		   "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",
- 			   ethhdr->h_source, vid);
+ 			   ethhdr->h_source, BATADV_PRINT_VID(vid));
    	break;
    case BATADV_CLAIM_TYPE_REQUEST:
    	/* request frame
@@@ -335,13 -336,14 +336,14 @@@
    	memcpy(hw_src, mac, ETH_ALEN);
    	memcpy(ethhdr->h_dest, mac, ETH_ALEN);
    	batadv_dbg(BATADV_DBG_BLA, bat_priv,
- 			   "bla_send_claim(): REQUEST of %pM to %pMon vid %d\n",
- 			   ethhdr->h_source, ethhdr->h_dest, vid);
+ 			   "bla_send_claim(): REQUEST of %pM to %pM on vid %d\n",
+ 			   ethhdr->h_source, ethhdr->h_dest,
+ 			   BATADV_PRINT_VID(vid));
    	break;
    }
- 	if (vid != -1)
- 		skb = vlan_insert_tag(skb, vid);
+ 	if (vid & BATADV_VLAN_HAS_TAG)
+ 		skb = vlan_insert_tag(skb, vid & BATADV_VID_MASK);
skb_reset_mac_header(skb);
    skb->protocol = eth_type_trans(skb, soft_iface);
@@@ -367,7 -369,7 +369,7 @@@ out
   */
  static struct batadv_bla_backbone_gw *
  batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,
- 			   short vid, bool own_backbone)
+ 			   unsigned short vid, bool own_backbone)
  {
    struct batadv_bla_backbone_gw *entry;
    struct batadv_orig_node *orig_node;
@@@ -380,7 -382,7 +382,7 @@@
batadv_dbg(BATADV_DBG_BLA, bat_priv,
    	   "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",
- 		   orig, vid);
+ 		   orig, BATADV_PRINT_VID(vid));
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
    if (!entry)
@@@ -434,7 -436,7 +436,7 @@@
  static void
  batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,
    			  struct batadv_hard_iface *primary_if,
- 				  short vid)
+ 				  unsigned short vid)
  {
    struct batadv_bla_backbone_gw *backbone_gw;
@@@ -456,7 -458,7 +458,7 @@@
   */
  static void batadv_bla_answer_request(struct batadv_priv *bat_priv,
    			      struct batadv_hard_iface *primary_if,
- 				      short vid)
+ 				      unsigned short vid)
  {
    struct hlist_head *head;
    struct batadv_hashtable *hash;
@@@ -547,7 -549,7 +549,7 @@@ static void batadv_bla_send_announce(st
   * @backbone_gw: the backbone gateway which claims it
   */
  static void batadv_bla_add_claim(struct batadv_priv *bat_priv,
- 				 const uint8_t *mac, const short vid,
+ 				 const uint8_t *mac, const unsigned short vid,
    			 struct batadv_bla_backbone_gw *backbone_gw)
  {
    struct batadv_bla_claim *claim;
@@@ -572,7 -574,7 +574,7 @@@
    	atomic_set(&claim->refcount, 2);
    	batadv_dbg(BATADV_DBG_BLA, bat_priv,
    		   "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",
- 			   mac, vid);
+ 			   mac, BATADV_PRINT_VID(vid));
    	hash_added = batadv_hash_add(bat_priv->bla.claim_hash,
    				     batadv_compare_claim,
    				     batadv_choose_claim, claim,
@@@ -591,7 -593,7 +593,7 @@@
batadv_dbg(BATADV_DBG_BLA, bat_priv,
    		   "bla_add_claim(): changing ownership for %pM, vid %d\n",
- 			   mac, vid);
+ 			   mac, BATADV_PRINT_VID(vid));
claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);
    	batadv_backbone_gw_free_ref(claim->backbone_gw);
@@@ -611,7 -613,7 +613,7 @@@ claim_free_ref
   * given mac address and vid.
   */
  static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
- 				 const uint8_t *mac, const short vid)
+ 				 const uint8_t *mac, const unsigned short vid)
  {
    struct batadv_bla_claim search_claim, *claim;
@@@ -622,7 -624,7 +624,7 @@@
    	return;
batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",
- 		   mac, vid);
+ 		   mac, BATADV_PRINT_VID(vid));
batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,
    		   batadv_choose_claim, claim);
@@@ -637,7 -639,7 +639,7 @@@
  /* 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,
- 				  short vid)
+ 				  unsigned short vid)
  {
    struct batadv_bla_backbone_gw *backbone_gw;
    uint16_t crc;
@@@ -658,12 -660,13 +660,13 @@@
batadv_dbg(BATADV_DBG_BLA, bat_priv,
    	   "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",
- 		   vid, backbone_gw->orig, crc);
+ 		   BATADV_PRINT_VID(vid), backbone_gw->orig, crc);
if (backbone_gw->crc != crc) {
    	batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,
    		   "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",
- 			   backbone_gw->orig, backbone_gw->vid,
+ 			   backbone_gw->orig,
+ 			   BATADV_PRINT_VID(backbone_gw->vid),
    		   backbone_gw->crc, crc);
batadv_bla_send_request(backbone_gw);
@@@ -685,7 -688,7 +688,7 @@@
  static int batadv_handle_request(struct batadv_priv *bat_priv,
    			 struct batadv_hard_iface *primary_if,
    			 uint8_t *backbone_addr,
- 				 struct ethhdr *ethhdr, short vid)
+ 				 struct ethhdr *ethhdr, unsigned short vid)
  {
    /* check for REQUEST frame */
    if (!batadv_compare_eth(backbone_addr, ethhdr->h_dest))
@@@ -699,7 -702,7 +702,7 @@@
batadv_dbg(BATADV_DBG_BLA, bat_priv,
    	   "handle_request(): REQUEST vid %d (sent by %pM)...\n",
- 		   vid, ethhdr->h_source);
+ 		   BATADV_PRINT_VID(vid), ethhdr->h_source);
batadv_bla_answer_request(bat_priv, primary_if, vid);
    return 1;
@@@ -709,7 -712,7 +712,7 @@@
  static int batadv_handle_unclaim(struct batadv_priv *bat_priv,
    			 struct batadv_hard_iface *primary_if,
    			 uint8_t *backbone_addr,
- 				 uint8_t *claim_addr, short vid)
+ 				 uint8_t *claim_addr, unsigned short vid)
  {
    struct batadv_bla_backbone_gw *backbone_gw;
@@@ -727,7 -730,7 +730,7 @@@
    /* this must be an UNCLAIM frame */
    batadv_dbg(BATADV_DBG_BLA, bat_priv,
    	   "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",
- 		   claim_addr, vid, backbone_gw->orig);
+ 		   claim_addr, BATADV_PRINT_VID(vid), backbone_gw->orig);
batadv_bla_del_claim(bat_priv, claim_addr, vid);
    batadv_backbone_gw_free_ref(backbone_gw);
@@@ -738,7 -741,7 +741,7 @@@
  static int batadv_handle_claim(struct batadv_priv *bat_priv,
    		       struct batadv_hard_iface *primary_if,
    		       uint8_t *backbone_addr, uint8_t *claim_addr,
- 			       short vid)
+ 			       unsigned short vid)
  {
    struct batadv_bla_backbone_gw *backbone_gw;
@@@ -861,14 -864,15 +864,15 @@@ static int batadv_bla_process_claim(str
    struct batadv_bla_claim_dst *bla_dst;
    uint16_t proto;
    int headlen;
- 	short vid = -1;
+ 	unsigned short vid = BATADV_NO_FLAGS;
    int ret;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) {
    	vhdr = (struct vlan_ethhdr *)ethhdr;
    	vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
+ 		vid |= BATADV_VLAN_HAS_TAG;
    	proto = ntohs(vhdr->h_vlan_encapsulated_proto);
    	headlen = sizeof(*vhdr);
    } else {
@@@ -885,7 -889,7 +889,7 @@@
    	return 0;
/* pskb_may_pull() may have modified the pointers, get ethhdr again */
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
    arphdr = (struct arphdr *)((uint8_t *)ethhdr + headlen);
/* Check whether the ARP frame carries a valid
@@@ -910,7 -914,8 +914,8 @@@
    if (ret == 1)
    	batadv_dbg(BATADV_DBG_BLA, bat_priv,
    		   "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
- 			   ethhdr->h_source, vid, hw_src, hw_dst);
+ 			   ethhdr->h_source, BATADV_PRINT_VID(vid), hw_src,
+ 			   hw_dst);
if (ret < 2)
    	return ret;
@@@ -945,7 -950,7 +950,7 @@@
batadv_dbg(BATADV_DBG_BLA, bat_priv,
    	   "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",
- 		   ethhdr->h_source, vid, hw_src, hw_dst);
+ 		   ethhdr->h_source, BATADV_PRINT_VID(vid), hw_src, hw_dst);
    return 1;
  }
@@@ -1358,7 -1363,7 +1363,7 @@@ int batadv_bla_is_backbone_gw(struct sk
    struct ethhdr *ethhdr;
    struct vlan_ethhdr *vhdr;
    struct batadv_bla_backbone_gw *backbone_gw;
- 	short vid = -1;
+ 	unsigned short vid = BATADV_NO_FLAGS;
if (!atomic_read(&orig_node->bat_priv->bridge_loop_avoidance))
    	return 0;
@@@ -1375,6 -1380,7 +1380,7 @@@
vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size);
    	vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
+ 		vid |= BATADV_VLAN_HAS_TAG;
    }
/* see if this originator is a backbone gw for this VLAN */
@@@ -1424,15 -1430,15 +1430,15 @@@ void batadv_bla_free(struct batadv_pri
   * returns 1, otherwise it returns 0 and the caller shall further
   * process the skb.
   */
- int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
- 		  bool is_bcast)
+ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 		  unsigned short vid, bool is_bcast)
  {
    struct ethhdr *ethhdr;
    struct batadv_bla_claim search_claim, *claim = NULL;
    struct batadv_hard_iface *primary_if;
    int ret;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
primary_if = batadv_primary_if_get_selected(bat_priv);
    if (!primary_if)
@@@ -1519,7 -1525,8 +1525,8 @@@ out
   * returns 1, otherwise it returns 0 and the caller shall further
   * process the skb.
   */
- int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
+ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 		  unsigned short vid)
  {
    struct ethhdr *ethhdr;
    struct batadv_bla_claim search_claim, *claim = NULL;
@@@ -1539,7 -1546,7 +1546,7 @@@
    if (batadv_bla_process_claim(bat_priv, primary_if, skb))
    	goto handled;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
if (unlikely(atomic_read(&bat_priv->bla.num_requests)))
    	/* don't allow broadcasts while requests are in flight */
@@@ -1623,8 -1630,8 +1630,8 @@@ int batadv_bla_claim_table_seq_print_te
    	hlist_for_each_entry_rcu(claim, head, hash_entry) {
    		is_own = batadv_compare_eth(claim->backbone_gw->orig,
    					    primary_addr);
- 			seq_printf(seq,	" * %pM on % 5d by %pM [%c] (%#.4x)\n",
- 				   claim->addr, claim->vid,
+ 			seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",
+ 				   claim->addr, BATADV_PRINT_VID(claim->vid),
    			   claim->backbone_gw->orig,
    			   (is_own ? 'x' : ' '),
    			   claim->backbone_gw->crc);
@@@ -1676,10 -1683,10 +1683,10 @@@ int batadv_bla_backbone_table_seq_print
    		if (is_own)
    			continue;
- 			seq_printf(seq,
- 				   " * %pM on % 5d % 4i.%03is (%#.4x)\n",
- 				   backbone_gw->orig, backbone_gw->vid,
- 				   secs, msecs, backbone_gw->crc);
+ 			seq_printf(seq, " * %pM on %5d %4i.%03is (%#.4x)\n",
+ 				   backbone_gw->orig,
+ 				   BATADV_PRINT_VID(backbone_gw->vid), secs,
+ 				   msecs, backbone_gw->crc);
    	}
    	rcu_read_unlock();
    }
diff --combined net/batman-adv/bridge_loop_avoidance.h
index dea2fbc,4b102e7..4b102e7
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@@ -21,9 -21,10 +21,10 @@@
  #define _NET_BATMAN_ADV_BLA_H_
#ifdef CONFIG_BATMAN_ADV_BLA
- int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
- 		  bool is_bcast);
- int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
+ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 		  unsigned short vid, bool is_bcast);
+ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
+ 		  unsigned short vid);
  int batadv_bla_is_backbone_gw(struct sk_buff *skb,
    		      struct batadv_orig_node *orig_node, int hdr_size);
  int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
@@@ -42,13 -43,14 +43,14 @@@ void batadv_bla_free(struct batadv_pri
  #else /* ifdef CONFIG_BATMAN_ADV_BLA */
static inline int batadv_bla_rx(struct batadv_priv *bat_priv,
- 				struct sk_buff *skb, short vid, bool is_bcast)
+ 				struct sk_buff *skb, unsigned short vid,
+ 				bool is_bcast)
  {
    return 0;
  }
static inline int batadv_bla_tx(struct batadv_priv *bat_priv,
- 				struct sk_buff *skb, short vid)
+ 				struct sk_buff *skb, unsigned short vid)
  {
    return 0;
  }
diff --combined net/batman-adv/distributed-arp-table.c
index 8e15d96,3a3e1d8..3a3e1d8
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@@ -45,9 -45,9 +45,9 @@@ static void batadv_dat_start_timer(stru
  }
/**
-  * batadv_dat_entry_free_ref - decrements the dat_entry refcounter and possibly
+  * batadv_dat_entry_free_ref - decrement the dat_entry refcounter and possibly
   * free it
-  * @dat_entry: the oentry to free
+  * @dat_entry: the entry to free
   */
  static void batadv_dat_entry_free_ref(struct batadv_dat_entry *dat_entry)
  {
@@@ -56,10 -56,10 +56,10 @@@
  }
/**
-  * batadv_dat_to_purge - checks whether a dat_entry has to be purged or not
+  * batadv_dat_to_purge - check whether a dat_entry has to be purged or not
   * @dat_entry: the entry to check
   *
-  * Returns true if the entry has to be purged now, false otherwise
+  * Returns true if the entry has to be purged now, false otherwise.
   */
  static bool batadv_dat_to_purge(struct batadv_dat_entry *dat_entry)
  {
@@@ -75,8 -75,8 +75,8 @@@
   *	      returns a boolean value: true is the entry has to be deleted,
   *	      false otherwise
   *
-  * Loops over each entry in the DAT local storage and delete it if and only if
-  * the to_purge function passed as argument returns true
+  * Loops over each entry in the DAT local storage and deletes it if and only if
+  * the to_purge function passed as argument returns true.
   */
  static void __batadv_dat_purge(struct batadv_priv *bat_priv,
    		       bool (*to_purge)(struct batadv_dat_entry *))
@@@ -97,7 -97,7 +97,7 @@@
    	spin_lock_bh(list_lock);
    	hlist_for_each_entry_safe(dat_entry, node_tmp, head,
    				  hash_entry) {
- 			/* if an helper function has been passed as parameter,
+ 			/* if a helper function has been passed as parameter,
    		 * ask it if the entry has to be purged or not
    		 */
    		if (to_purge && !to_purge(dat_entry))
@@@ -134,7 -134,7 +134,7 @@@ static void batadv_dat_purge(struct wor
   * @node: node in the local table
   * @data2: second object to compare the node to
   *
-  * Returns 1 if the two entry are the same, 0 otherwise
+  * Returns 1 if the two entries are the same, 0 otherwise.
   */
  static int batadv_compare_dat(const struct hlist_node *node, const void *data2)
  {
@@@ -149,7 -149,7 +149,7 @@@
   * @skb: ARP packet
   * @hdr_size: size of the possible header before the ARP packet
   *
-  * Returns the value of the hw_src field in the ARP packet
+  * Returns the value of the hw_src field in the ARP packet.
   */
  static uint8_t *batadv_arp_hw_src(struct sk_buff *skb, int hdr_size)
  {
@@@ -166,7 -166,7 +166,7 @@@
   * @skb: ARP packet
   * @hdr_size: size of the possible header before the ARP packet
   *
-  * Returns the value of the ip_src field in the ARP packet
+  * Returns the value of the ip_src field in the ARP packet.
   */
  static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size)
  {
@@@ -178,7 -178,7 +178,7 @@@
   * @skb: ARP packet
   * @hdr_size: size of the possible header before the ARP packet
   *
-  * Returns the value of the hw_dst field in the ARP packet
+  * Returns the value of the hw_dst field in the ARP packet.
   */
  static uint8_t *batadv_arp_hw_dst(struct sk_buff *skb, int hdr_size)
  {
@@@ -190,7 -190,7 +190,7 @@@
   * @skb: ARP packet
   * @hdr_size: size of the possible header before the ARP packet
   *
-  * Returns the value of the ip_dst field in the ARP packet
+  * Returns the value of the ip_dst field in the ARP packet.
   */
  static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size)
  {
@@@ -202,7 -202,7 +202,7 @@@
   * @data: data to hash
   * @size: size of the hash table
   *
-  * Returns the selected index in the hash table for the given data
+  * Returns the selected index in the hash table for the given data.
   */
  static uint32_t batadv_hash_dat(const void *data, uint32_t size)
  {
@@@ -224,12 -224,12 +224,12 @@@
  }
/**
-  * batadv_dat_entry_hash_find - looks for a given dat_entry in the local hash
+  * batadv_dat_entry_hash_find - look for a given dat_entry in the local hash
   * table
   * @bat_priv: the bat priv with all the soft interface information
   * @ip: search key
   *
-  * Returns the dat_entry if found, NULL otherwise
+  * Returns the dat_entry if found, NULL otherwise.
   */
  static struct batadv_dat_entry *
  batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip)
@@@ -343,9 -343,6 +343,6 @@@ static void batadv_dbg_arp(struct batad
    if (hdr_size == 0)
    	return;
- 	/* if the ARP packet is encapsulated in a batman packet, let's print
- 	 * some debug messages
- 	 */
    unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)skb->data;
switch (unicast_4addr_packet->u.header.packet_type) {
@@@ -409,7 -406,8 +406,8 @@@ static void batadv_dbg_arp(struct batad
   * @candidate: orig_node under evaluation
   * @max_orig_node: last selected candidate
   *
-  * Returns true if the node has been elected as next candidate or false othrwise
+  * Returns true if the node has been elected as next candidate or false
+  * otherwise.
   */
  static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
    				 int select, batadv_dat_addr_t tmp_max,
@@@ -472,7 -470,7 +470,7 @@@ static void batadv_choose_next_candidat
     */
    cands[select].type = BATADV_DAT_CANDIDATE_NOT_FOUND;
- 	/* iterate over the originator list and find the node with closest
+ 	/* iterate over the originator list and find the node with the closest
     * dat_address which has not been selected yet
     */
    for (i = 0; i < hash->size; i++) {
@@@ -480,7 -478,7 +478,7 @@@
rcu_read_lock();
    	hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
- 			/* the dht space is a ring and addresses are unsigned */
+ 			/* the dht space is a ring using unsigned addresses */
    		tmp_max = BATADV_DAT_ADDR_MAX - orig_node->dat_addr +
    			  ip_key;
@@@ -512,7 -510,7 +510,7 @@@
  }
/**
-  * batadv_dat_select_candidates - selects the nodes which the DHT message has to
+  * batadv_dat_select_candidates - select the nodes which the DHT message has to
   * be sent to
   * @bat_priv: the bat priv with all the soft interface information
   * @ip_dst: ipv4 to look up in the DHT
@@@ -521,7 -519,7 +519,7 @@@
   * closest values (from the LEFT, with wrap around if needed) then the hash
   * value of the key. ip_dst is the key.
   *
-  * Returns the candidate array of size BATADV_DAT_CANDIDATE_NUM
+  * Returns the candidate array of size BATADV_DAT_CANDIDATE_NUM.
   */
  static struct batadv_dat_candidate *
  batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst)
@@@ -558,10 -556,11 +556,11 @@@
   * @ip: the DHT key
   * @packet_subtype: unicast4addr packet subtype to use
   *
-  * In this function the skb is copied by means of pskb_copy() and is sent as
-  * unicast packet to each of the selected candidates
+  * This function copies the skb with pskb_copy() and is sent as unicast packet
+  * to each of the selected candidates.
   *
-  * Returns true if the packet is sent to at least one candidate, false otherwise
+  * Returns true if the packet is sent to at least one candidate, false
+  * otherwise.
   */
  static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
    			 struct sk_buff *skb, __be32 ip,
@@@ -727,7 -726,7 +726,7 @@@ out
   * @skb: packet to analyse
   * @hdr_size: size of the possible header before the ARP packet in the skb
   *
-  * Returns the ARP type if the skb contains a valid ARP packet, 0 otherwise
+  * Returns the ARP type if the skb contains a valid ARP packet, 0 otherwise.
   */
  static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv,
    			    struct sk_buff *skb, int hdr_size)
@@@ -754,9 -753,7 +753,7 @@@
arphdr = (struct arphdr *)(skb->data + hdr_size + ETH_HLEN);
- 	/* Check whether the ARP packet carries a valid
- 	 * IP information
- 	 */
+ 	/* check whether the ARP packet carries a valid IP information */
    if (arphdr->ar_hrd != htons(ARPHRD_ETHER))
    	goto out;
@@@ -784,7 -781,7 +781,7 @@@
    if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src))
    	goto out;
- 	/* we don't care about the destination MAC address in ARP requests */
+ 	/* don't care about the destination MAC address in ARP requests */
    if (arphdr->ar_op != htons(ARPOP_REQUEST)) {
    	hw_dst = batadv_arp_hw_dst(skb, hdr_size);
    	if (is_zero_ether_addr(hw_dst) ||
@@@ -804,8 -801,8 +801,8 @@@ out
   * @skb: packet to check
   *
   * Returns true if the message has been sent to the dht candidates, false
-  * otherwise. In case of true the message has to be enqueued to permit the
-  * fallback
+  * otherwise. In case of a positive return value the message has to be enqueued
+  * to permit the fallback.
   */
  bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
    				   struct sk_buff *skb)
@@@ -854,7 -851,7 +851,7 @@@
    	batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n");
    	ret = true;
    } else {
- 		/* Send the request on the DHT */
+ 		/* Send the request to the DHT */
    	ret = batadv_dat_send_data(bat_priv, skb, ip_dst,
    				   BATADV_P_DAT_DHT_GET);
    }
@@@ -871,7 -868,7 +868,7 @@@ out
   * @skb: packet to check
   * @hdr_size: size of the encapsulation header
   *
-  * Returns true if the request has been answered, false otherwise
+  * Returns true if the request has been answered, false otherwise.
   */
  bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
    				   struct sk_buff *skb, int hdr_size)
@@@ -911,10 -908,9 +908,9 @@@
    if (!skb_new)
    	goto out;
- 	/* to preserve backwards compatibility, here the node has to answer
- 	 * using the same packet type it received for the request. This is due
- 	 * to that if a node is not using the 4addr packet format it may not
- 	 * support it.
+ 	/* To preserve backwards compatibility, the node has choose the outgoing
+ 	 * format based on the incoming request packet type. The assumption is
+ 	 * that a node not using the 4addr packet format doesn't support it.
     */
    if (hdr_size == sizeof(struct batadv_unicast_4addr_packet))
    	err = batadv_unicast_4addr_send_skb(bat_priv, skb_new,
@@@ -964,7 -960,7 +960,7 @@@ void batadv_dat_snoop_outgoing_arp_repl
    batadv_dat_entry_add(bat_priv, ip_dst, hw_dst);
/* Send the ARP reply to the candidates for both the IP addresses that
- 	 * the node got within the ARP reply
+ 	 * the node obtained from the ARP reply
     */
    batadv_dat_send_data(bat_priv, skb, ip_src, BATADV_P_DAT_DHT_PUT);
    batadv_dat_send_data(bat_priv, skb, ip_dst, BATADV_P_DAT_DHT_PUT);
@@@ -974,7 -970,7 +970,7 @@@
   * DAT storage only
   * @bat_priv: the bat priv with all the soft interface information
   * @skb: packet to check
-  * @hdr_size: siaze of the encapsulation header
+  * @hdr_size: size of the encapsulation header
   */
  bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
    				 struct sk_buff *skb, int hdr_size)
@@@ -1018,11 -1014,11 +1014,11 @@@ out
/**
   * batadv_dat_drop_broadcast_packet - check if an ARP request has to be dropped
-  * (because the node has already got the reply via DAT) or not
+  * (because the node has already obtained the reply via DAT) or not
   * @bat_priv: the bat priv with all the soft interface information
   * @forw_packet: the broadcast packet
   *
-  * Returns true if the node can drop the packet, false otherwise
+  * Returns true if the node can drop the packet, false otherwise.
   */
  bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,
    			      struct batadv_forw_packet *forw_packet)
diff --combined net/batman-adv/hard-interface.c
index 522243a,dc4ac29..dc4ac29
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@@ -117,6 -117,58 +117,58 @@@ static int batadv_is_valid_iface(const 
    return 1;
  }
+ /**
+  * batadv_is_wifi_netdev - check if the given net_device struct is a wifi
+  *  interface
+  * @net_device: the device to check
+  *
+  * Returns true if the net device is a 802.11 wireless device, false otherwise.
+  */
+ static bool batadv_is_wifi_netdev(struct net_device *net_device)
+ {
+ #ifdef CONFIG_WIRELESS_EXT
+ 	/* pre-cfg80211 drivers have to implement WEXT, so it is possible to
+ 	 * check for wireless_handlers != NULL
+ 	 */
+ 	if (net_device->wireless_handlers)
+ 		return true;
+ #endif
+ 
+ 	/* cfg80211 drivers have to set ieee80211_ptr */
+ 	if (net_device->ieee80211_ptr)
+ 		return true;
+ 
+ 	return false;
+ }
+ 
+ /**
+  * batadv_is_wifi_iface - check if the given interface represented by ifindex
+  *  is a wifi interface
+  * @ifindex: interface index to check
+  *
+  * Returns true if the interface represented by ifindex is a 802.11 wireless
+  * device, false otherwise.
+  */
+ bool batadv_is_wifi_iface(int ifindex)
+ {
+ 	struct net_device *net_device = NULL;
+ 	bool ret = false;
+ 
+ 	if (ifindex == BATADV_NULL_IFINDEX)
+ 		goto out;
+ 
+ 	net_device = dev_get_by_index(&init_net, ifindex);
+ 	if (!net_device)
+ 		goto out;
+ 
+ 	ret = batadv_is_wifi_netdev(net_device);
+ 
+ out:
+ 	if (net_device)
+ 		dev_put(net_device);
+ 	return ret;
+ }
+ 
  static struct batadv_hard_iface *
  batadv_hardif_get_active(const struct net_device *soft_iface)
  {
@@@ -525,7 -577,7 +577,7 @@@ batadv_hardif_add_interface(struct net_
dev_hold(net_dev);
- 	hard_iface = kmalloc(sizeof(*hard_iface), GFP_ATOMIC);
+ 	hard_iface = kzalloc(sizeof(*hard_iface), GFP_ATOMIC);
    if (!hard_iface)
    	goto release_dev;
@@@ -541,18 -593,16 +593,16 @@@
    INIT_WORK(&hard_iface->cleanup_work,
    	  batadv_hardif_remove_interface_finish);
+ 	hard_iface->num_bcasts = BATADV_NUM_BCASTS_DEFAULT;
+ 	if (batadv_is_wifi_netdev(net_dev))
+ 		hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;
+ 
    /* extra reference for return */
    atomic_set(&hard_iface->refcount, 2);
batadv_check_known_mac_addr(hard_iface->net_dev);
    list_add_tail_rcu(&hard_iface->list, &batadv_hardif_list);
- 	/* This can't be called via a bat_priv callback because
- 	 * we have no bat_priv yet.
- 	 */
- 	atomic_set(&hard_iface->bat_iv.ogm_seqno, 1);
- 	hard_iface->bat_iv.ogm_buff = NULL;
- 
    return hard_iface;
free_if:
@@@ -657,38 -707,6 +707,6 @@@ out
    return NOTIFY_DONE;
  }
- /* This function returns true if the interface represented by ifindex is a
-  * 802.11 wireless device
-  */
- bool batadv_is_wifi_iface(int ifindex)
- {
- 	struct net_device *net_device = NULL;
- 	bool ret = false;
- 
- 	if (ifindex == BATADV_NULL_IFINDEX)
- 		goto out;
- 
- 	net_device = dev_get_by_index(&init_net, ifindex);
- 	if (!net_device)
- 		goto out;
- 
- #ifdef CONFIG_WIRELESS_EXT
- 	/* pre-cfg80211 drivers have to implement WEXT, so it is possible to
- 	 * check for wireless_handlers != NULL
- 	 */
- 	if (net_device->wireless_handlers)
- 		ret = true;
- 	else
- #endif
- 		/* cfg80211 drivers have to set ieee80211_ptr */
- 		if (net_device->ieee80211_ptr)
- 			ret = true;
- out:
- 	if (net_device)
- 		dev_put(net_device);
- 	return ret;
- }
- 
  struct notifier_block batadv_hard_if_notifier = {
    .notifier_call = batadv_hard_if_event,
  };
diff --combined net/batman-adv/icmp_socket.c
index 0ba6c89,b27508b..b27508b
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@@ -177,13 -177,13 +177,13 @@@ static ssize_t batadv_socket_write(stru
    if (len >= sizeof(struct batadv_icmp_packet_rr))
    	packet_len = sizeof(struct batadv_icmp_packet_rr);
- 	skb = dev_alloc_skb(packet_len + ETH_HLEN + NET_IP_ALIGN);
+ 	skb = netdev_alloc_skb_ip_align(NULL, packet_len + ETH_HLEN);
    if (!skb) {
    	len = -ENOMEM;
    	goto out;
    }
- 	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);
+ 	skb_reserve(skb, ETH_HLEN);
    icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len);
if (copy_from_user(icmp_packet, buff, packet_len)) {
diff --combined net/batman-adv/main.c
index 3e30a0f,aae96ca..aae96ca
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@@ -173,6 -173,7 +173,7 @@@ void batadv_mesh_free(struct net_devic
    batadv_dat_free(bat_priv);
free_percpu(bat_priv->bat_counters);
+ 	bat_priv->bat_counters = NULL;
atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
  }
diff --combined net/batman-adv/main.h
index 59a0d6a,0000000..4dc5bb3
mode 100644,000000..100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@@ -1,312 -1,0 +1,330 @@@
 +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors:
 + *
 + * Marek Lindner, Simon Wunderlich
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of version 2 of the GNU General Public
 + * License as published by the Free Software Foundation.
 + *
 + * This program is distributed in the hope that it will be useful, but
 + * WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 + * General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 + * 02110-1301, USA
 + */
 +
 +#ifndef _NET_BATMAN_ADV_MAIN_H_
 +#define _NET_BATMAN_ADV_MAIN_H_
 +
 +#define BATADV_DRIVER_AUTHOR "Marek Lindner lindner_marek@yahoo.de, " \
 +			     "Simon Wunderlich siwu@hrz.tu-chemnitz.de"
 +#define BATADV_DRIVER_DESC   "B.A.T.M.A.N. advanced"
 +#define BATADV_DRIVER_DEVICE "batman-adv"
 +
 +#ifndef BATADV_SOURCE_VERSION
- #define BATADV_SOURCE_VERSION "2013.2.0"
++#define BATADV_SOURCE_VERSION "2013.3.0"
 +#endif
 +
 +/* B.A.T.M.A.N. parameters */
 +
 +#define BATADV_TQ_MAX_VALUE 255
 +#define BATADV_JITTER 20
 +
 +/* Time To Live of broadcast messages */
 +#define BATADV_TTL 50
 +
 +/* purge originators after time in seconds if no valid packet comes in
 + * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE
 + */
 +#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */
 +#define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */
 +#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */
 +#define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */
 +#define BATADV_TT_WORK_PERIOD 5000 /* 5 seconds */
 +#define BATADV_ORIG_WORK_PERIOD 1000 /* 1 second */
 +#define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */
 +/* sliding packet range of received originator messages in sequence numbers
 + * (should be a multiple of our word size)
 + */
 +#define BATADV_TQ_LOCAL_WINDOW_SIZE 64
 +/* milliseconds we have to keep pending tt_req */
 +#define BATADV_TT_REQUEST_TIMEOUT 3000
 +
 +#define BATADV_TQ_GLOBAL_WINDOW_SIZE 5
 +#define BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
 +#define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1
 +#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1
 +
 +/* number of OGMs sent with the last tt diff */
 +#define BATADV_TT_OGM_APPEND_MAX 3
 +
 +/* Time in which a client can roam at most ROAMING_MAX_COUNT times in
 + * milliseconds
 + */
 +#define BATADV_ROAMING_MAX_TIME 20000
 +#define BATADV_ROAMING_MAX_COUNT 5
 +
 +#define BATADV_NO_FLAGS 0
 +
 +#define BATADV_NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */
 +
 +#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE)
 +
 +#define BATADV_LOG_BUF_LEN 8192	  /* has to be a power of 2 */
 +
++/* number of packets to send for broadcasts on different interface types */
++#define BATADV_NUM_BCASTS_DEFAULT 1
++#define BATADV_NUM_BCASTS_WIRELESS 3
++#define BATADV_NUM_BCASTS_MAX 3
++
 +/* msecs after which an ARP_REQUEST is sent in broadcast as fallback */
 +#define ARP_REQ_DELAY 250
 +/* numbers of originator to contact for any PUT/GET DHT operation */
 +#define BATADV_DAT_CANDIDATES_NUM 3
 +
 +#define BATADV_VIS_INTERVAL 5000	/* 5 seconds */
 +
 +/* how much worse secondary interfaces may be to be considered as bonding
 + * candidates
 + */
 +#define BATADV_BONDING_TQ_THRESHOLD	50
 +
 +/* should not be bigger than 512 bytes or change the size of
 + * forw_packet->direct_link_flags
 + */
 +#define BATADV_MAX_AGGREGATION_BYTES 512
 +#define BATADV_MAX_AGGREGATION_MS 100
 +
 +#define BATADV_BLA_PERIOD_LENGTH	10000	/* 10 seconds */
 +#define BATADV_BLA_BACKBONE_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 3)
 +#define BATADV_BLA_CLAIM_TIMEOUT	(BATADV_BLA_PERIOD_LENGTH * 10)
 +#define BATADV_BLA_WAIT_PERIODS		3
 +
 +#define BATADV_DUPLIST_SIZE		16
 +#define BATADV_DUPLIST_TIMEOUT		500	/* 500 ms */
 +/* don't reset again within 30 seconds */
 +#define BATADV_RESET_PROTECTION_MS 30000
 +#define BATADV_EXPECTED_SEQNO_RANGE	65536
 +
 +#define BATADV_NC_NODE_TIMEOUT 10000 /* Milliseconds */
 +
 +enum batadv_mesh_state {
 +	BATADV_MESH_INACTIVE,
 +	BATADV_MESH_ACTIVE,
 +	BATADV_MESH_DEACTIVATING,
 +};
 +
 +#define BATADV_BCAST_QUEUE_LEN		256
 +#define BATADV_BATMAN_QUEUE_LEN	256
 +
 +enum batadv_uev_action {
 +	BATADV_UEV_ADD = 0,
 +	BATADV_UEV_DEL,
 +	BATADV_UEV_CHANGE,
 +};
 +
 +enum batadv_uev_type {
 +	BATADV_UEV_GW = 0,
 +};
 +
 +#define BATADV_GW_THRESHOLD	50
 +
 +#define BATADV_DAT_CANDIDATE_NOT_FOUND	0
 +#define BATADV_DAT_CANDIDATE_ORIG	1
 +
 +/* Debug Messages */
 +#ifdef pr_fmt
 +#undef pr_fmt
 +#endif
 +/* Append 'batman-adv: ' before kernel messages */
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
 +/* Kernel headers */
 +
 +#include <linux/mutex.h>	/* mutex */
 +#include <linux/module.h>	/* needed by all modules */
 +#include <linux/netdevice.h>	/* netdevice */
 +#include <linux/etherdevice.h>  /* ethernet address classification */
 +#include <linux/if_ether.h>	/* ethernet header */
 +#include <linux/poll.h>		/* poll_table */
 +#include <linux/kthread.h>	/* kernel threads */
 +#include <linux/pkt_sched.h>	/* schedule types */
 +#include <linux/workqueue.h>	/* workqueue */
 +#include <linux/percpu.h>
 +#include <linux/slab.h>
 +#include <net/sock.h>		/* struct sock */
 +#include <net/rtnetlink.h>
 +#include <linux/jiffies.h>
 +#include <linux/seq_file.h>
 +#include "types.h"
 +
++/**
++ * batadv_vlan_flags - flags for the four MSB of any vlan ID field
++ * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not
++ */
++enum batadv_vlan_flags {
++	BATADV_VLAN_HAS_TAG	= BIT(15),
++};
++
++/* mask needed to extract the vlan ID (12bits) from a 16bits variable */
++#define BATADV_VID_MASK	0x0FFF
++#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \
++			       (int)(vid & BATADV_VID_MASK) : -1)
++
 +extern char batadv_routing_algo[];
 +extern struct list_head batadv_hardif_list;
 +
 +extern unsigned char batadv_broadcast_addr[];
 +extern struct workqueue_struct *batadv_event_workqueue;
 +
 +int batadv_mesh_init(struct net_device *soft_iface);
 +void batadv_mesh_free(struct net_device *soft_iface);
 +int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);
 +struct batadv_hard_iface *
 +batadv_seq_print_text_primary_if_get(struct seq_file *seq);
 +int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 +			   struct packet_type *ptype,
 +			   struct net_device *orig_dev);
 +int
 +batadv_recv_handler_register(uint8_t packet_type,
 +			     int (*recv_handler)(struct sk_buff *,
 +						 struct batadv_hard_iface *));
 +void batadv_recv_handler_unregister(uint8_t packet_type);
 +int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);
 +int batadv_algo_select(struct batadv_priv *bat_priv, char *name);
 +int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);
 +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr);
 +
 +/**
 + * enum batadv_dbg_level - available log levels
 + * @BATADV_DBG_BATMAN: OGM and TQ computations related messages
 + * @BATADV_DBG_ROUTES: route added / changed / deleted
 + * @BATADV_DBG_TT: translation table messages
 + * @BATADV_DBG_BLA: bridge loop avoidance messages
 + * @BATADV_DBG_DAT: ARP snooping and DAT related messages
 + * @BATADV_DBG_NC: network coding related messages
 + * @BATADV_DBG_ALL: the union of all the above log levels
 + */
 +enum batadv_dbg_level {
 +	BATADV_DBG_BATMAN = BIT(0),
 +	BATADV_DBG_ROUTES = BIT(1),
 +	BATADV_DBG_TT	  = BIT(2),
 +	BATADV_DBG_BLA    = BIT(3),
 +	BATADV_DBG_DAT    = BIT(4),
 +	BATADV_DBG_NC	  = BIT(5),
 +	BATADV_DBG_ALL    = 63,
 +};
 +
 +#ifdef CONFIG_BATMAN_ADV_DEBUG
 +int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
 +__printf(2, 3);
 +
 +#define batadv_dbg(type, bat_priv, fmt, arg...)			\
 +	do {							\
 +		if (atomic_read(&bat_priv->log_level) & type)	\
 +			batadv_debug_log(bat_priv, fmt, ## arg);\
 +	}							\
 +	while (0)
 +#else /* !CONFIG_BATMAN_ADV_DEBUG */
 +__printf(3, 4)
 +static inline void batadv_dbg(int type __always_unused,
 +			      struct batadv_priv *bat_priv __always_unused,
 +			      const char *fmt __always_unused, ...)
 +{
 +}
 +#endif
 +
 +#define batadv_info(net_dev, fmt, arg...)				\
 +	do {								\
 +		struct net_device *_netdev = (net_dev);                 \
 +		struct batadv_priv *_batpriv = netdev_priv(_netdev);    \
 +		batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg);	\
 +		pr_info("%s: " fmt, _netdev->name, ## arg);		\
 +	} while (0)
 +#define batadv_err(net_dev, fmt, arg...)				\
 +	do {								\
 +		struct net_device *_netdev = (net_dev);                 \
 +		struct batadv_priv *_batpriv = netdev_priv(_netdev);    \
 +		batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg);	\
 +		pr_err("%s: " fmt, _netdev->name, ## arg);		\
 +	} while (0)
 +
 +/* returns 1 if they are the same ethernet addr
 + *
 + * note: can't use compare_ether_addr() as it requires aligned memory
 + */
 +static inline int batadv_compare_eth(const void *data1, const void *data2)
 +{
 +	return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 +}
 +
 +/**
 + * has_timed_out - compares current time (jiffies) and timestamp + timeout
 + * @timestamp:		base value to compare with (in jiffies)
 + * @timeout:		added to base value before comparing (in milliseconds)
 + *
 + * Returns true if current time is after timestamp + timeout
 + */
 +static inline bool batadv_has_timed_out(unsigned long timestamp,
 +					unsigned int timeout)
 +{
 +	return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout));
 +}
 +
 +#define batadv_atomic_dec_not_zero(v)	atomic_add_unless((v), -1, 0)
 +
 +/* Returns the smallest signed integer in two's complement with the sizeof x */
 +#define batadv_smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u)))
 +
 +/* Checks if a sequence number x is a predecessor/successor of y.
 + * they handle overflows/underflows and can correctly check for a
 + * predecessor/successor unless the variable sequence number has grown by
 + * more then 2**(bitwidth(x)-1)-1.
 + * This means that for a uint8_t with the maximum value 255, it would think:
 + *  - when adding nothing - it is neither a predecessor nor a successor
 + *  - before adding more than 127 to the starting value - it is a predecessor,
 + *  - when adding 128 - it is neither a predecessor nor a successor,
 + *  - after adding more than 127 to the starting value - it is a successor
 + */
 +#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \
 +				 typeof(y) _d2 = (y); \
 +				 typeof(x) _dummy = (_d1 - _d2); \
 +				 (void) (&_d1 == &_d2); \
 +				 _dummy > batadv_smallest_signed_int(_dummy); })
 +#define batadv_seq_after(x, y) batadv_seq_before(y, x)
 +
 +/* Stop preemption on local cpu while incrementing the counter */
 +static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx,
 +				      size_t count)
 +{
 +	this_cpu_add(bat_priv->bat_counters[idx], count);
 +}
 +
 +#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1)
 +
 +/* Sum and return the cpu-local counters for index 'idx' */
 +static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv,
 +					  size_t idx)
 +{
 +	uint64_t *counters, sum = 0;
 +	int cpu;
 +
 +	for_each_possible_cpu(cpu) {
 +		counters = per_cpu_ptr(bat_priv->bat_counters, cpu);
 +		sum += counters[idx];
 +	}
 +
 +	return sum;
 +}
 +
 +/* Define a macro to reach the control buffer of the skb. The members of the
 + * control buffer are defined in struct batadv_skb_cb in types.h.
 + * The macro is inspired by the similar macro TCP_SKB_CB() in tcp.h.
 + */
 +#define BATADV_SKB_CB(__skb)       ((struct batadv_skb_cb *)&((__skb)->cb[0]))
 +
 +#endif /* _NET_BATMAN_ADV_MAIN_H_ */
diff --combined net/batman-adv/network-coding.c
index 4eb49fc,65af447..65af447
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@@ -1245,7 -1245,7 +1245,7 @@@ static void batadv_nc_skb_store_before_
    	return;
/* Set the mac header as if we actually sent the packet uncoded */
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
    memcpy(ethhdr->h_source, ethhdr->h_dest, ETH_ALEN);
    memcpy(ethhdr->h_dest, eth_dst_new, ETH_ALEN);
@@@ -1359,18 -1359,17 +1359,17 @@@ static bool batadv_nc_skb_add_to_path(s
   *  buffer
   * @skb: data skb to forward
   * @neigh_node: next hop to forward packet to
-  * @ethhdr: pointer to the ethernet header inside the skb
   *
   * Returns true if the skb was consumed (encoded packet sent) or false otherwise
   */
  bool batadv_nc_skb_forward(struct sk_buff *skb,
- 			   struct batadv_neigh_node *neigh_node,
- 			   struct ethhdr *ethhdr)
+ 			   struct batadv_neigh_node *neigh_node)
  {
    const struct net_device *netdev = neigh_node->if_incoming->soft_iface;
    struct batadv_priv *bat_priv = netdev_priv(netdev);
    struct batadv_unicast_packet *packet;
    struct batadv_nc_path *nc_path;
+ 	struct ethhdr *ethhdr = eth_hdr(skb);
    __be32 packet_id;
    u8 *payload;
@@@ -1423,7 -1422,7 +1422,7 @@@ void batadv_nc_skb_store_for_decoding(s
  {
    struct batadv_unicast_packet *packet;
    struct batadv_nc_path *nc_path;
- 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	struct ethhdr *ethhdr = eth_hdr(skb);
    __be32 packet_id;
    u8 *payload;
@@@ -1482,7 -1481,7 +1481,7 @@@ out
  void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
    				 struct sk_buff *skb)
  {
- 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	struct ethhdr *ethhdr = eth_hdr(skb);
if (batadv_is_my_mac(bat_priv, ethhdr->h_dest))
    	return;
@@@ -1504,8 -1503,7 +1503,7 @@@
   * in case of an error.
   */
  static struct batadv_unicast_packet *
- batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv,
- 			    struct sk_buff *skb,
+ batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
    		    struct batadv_nc_packet *nc_packet)
  {
    const int h_size = sizeof(struct batadv_unicast_packet);
@@@ -1533,7 -1531,7 +1531,7 @@@
    skb_reset_network_header(skb);
/* Reconstruct original mac header */
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
    memcpy(ethhdr, &ethhdr_tmp, sizeof(*ethhdr));
/* Select the correct unicast header information based on the location
@@@ -1674,7 -1672,7 +1672,7 @@@ static int batadv_nc_recv_coded_packet(
    	return NET_RX_DROP;
coded_packet = (struct batadv_coded_packet *)skb->data;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
/* Verify frame is destined for us */
    if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest) &&
@@@ -1760,6 -1758,13 +1758,13 @@@ int batadv_nc_nodes_seq_print_text(stru
    	/* For each orig_node in this bin */
    	rcu_read_lock();
    	hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
+ 			/* no need to print the orig node if it does not have
+ 			 * network coding neighbors
+ 			 */
+ 			if (list_empty(&orig_node->in_coding_list) &&
+ 			    list_empty(&orig_node->out_coding_list))
+ 				continue;
+ 
    		seq_printf(seq, "Node:      %pM\n", orig_node->orig);
seq_puts(seq, " Ingoing:  ");
diff --combined net/batman-adv/network-coding.h
index 4fa6d0c,85a4ec8..85a4ec8
--- a/net/batman-adv/network-coding.h
+++ b/net/batman-adv/network-coding.h
@@@ -36,8 -36,7 +36,7 @@@ void batadv_nc_purge_orig(struct batadv
  void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv);
  void batadv_nc_init_orig(struct batadv_orig_node *orig_node);
  bool batadv_nc_skb_forward(struct sk_buff *skb,
- 			   struct batadv_neigh_node *neigh_node,
- 			   struct ethhdr *ethhdr);
+ 			   struct batadv_neigh_node *neigh_node);
  void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,
    			      struct sk_buff *skb);
  void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
@@@ -87,8 -86,7 +86,7 @@@ static inline void batadv_nc_init_orig(
  }
static inline bool batadv_nc_skb_forward(struct sk_buff *skb,
- 					 struct batadv_neigh_node *neigh_node,
- 					 struct ethhdr *ethhdr)
+ 					 struct batadv_neigh_node *neigh_node)
  {
    return false;
  }
diff --combined net/batman-adv/originator.c
index 2f34525,f50553a..f50553a
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@@ -92,7 -92,7 +92,7 @@@ batadv_orig_node_get_router(struct bata
struct batadv_neigh_node *
  batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
- 		      const uint8_t *neigh_addr, uint32_t seqno)
+ 		      const uint8_t *neigh_addr)
  {
    struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
    struct batadv_neigh_node *neigh_node;
@@@ -110,8 -110,8 +110,8 @@@
    atomic_set(&neigh_node->refcount, 2);
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
- 		   "Creating new neighbor %pM, initial seqno %d\n",
- 		   neigh_addr, seqno);
+ 		   "Creating new neighbor %pM on interface %s\n", neigh_addr,
+ 		   hard_iface->net_dev->name);
out:
    return neigh_node;
@@@ -156,12 -156,28 +156,28 @@@ static void batadv_orig_node_free_rcu(s
    kfree(orig_node);
  }
+ /**
+  * batadv_orig_node_free_ref - decrement the orig node refcounter and possibly
+  * schedule an rcu callback for freeing it
+  * @orig_node: the orig node to free
+  */
  void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node)
  {
    if (atomic_dec_and_test(&orig_node->refcount))
    	call_rcu(&orig_node->rcu, batadv_orig_node_free_rcu);
  }
+ /**
+  * batadv_orig_node_free_ref_now - decrement the orig node refcounter and
+  * possibly free it (without rcu callback)
+  * @orig_node: the orig node to free
+  */
+ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node)
+ {
+ 	if (atomic_dec_and_test(&orig_node->refcount))
+ 		batadv_orig_node_free_rcu(&orig_node->rcu);
+ }
+ 
  void batadv_originator_free(struct batadv_priv *bat_priv)
  {
    struct batadv_hashtable *hash = bat_priv->orig_hash;
diff --combined net/batman-adv/originator.h
index 7df48fa,7887b84..7887b84
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@@ -26,11 -26,12 +26,12 @@@ int batadv_originator_init(struct batad
  void batadv_originator_free(struct batadv_priv *bat_priv);
  void batadv_purge_orig_ref(struct batadv_priv *bat_priv);
  void batadv_orig_node_free_ref(struct batadv_orig_node *orig_node);
+ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node);
  struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,
    				      const uint8_t *addr);
  struct batadv_neigh_node *
  batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
- 		      const uint8_t *neigh_addr, uint32_t seqno);
+ 		      const uint8_t *neigh_addr);
  void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node);
  struct batadv_neigh_node *
  batadv_orig_node_get_router(struct batadv_orig_node *orig_node);
diff --combined net/batman-adv/routing.c
index 2f1f889,2f0bd3f..2f0bd3f
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@@ -34,35 -34,6 +34,6 @@@
  static int batadv_route_unicast_packet(struct sk_buff *skb,
    			       struct batadv_hard_iface *recv_if);
- void batadv_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)
- {
- 	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
- 	struct batadv_hashtable *hash = bat_priv->orig_hash;
- 	struct hlist_head *head;
- 	struct batadv_orig_node *orig_node;
- 	unsigned long *word;
- 	uint32_t i;
- 	size_t word_index;
- 	uint8_t *w;
- 
- 	for (i = 0; i < hash->size; i++) {
- 		head = &hash->table[i];
- 
- 		rcu_read_lock();
- 		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
- 			spin_lock_bh(&orig_node->ogm_cnt_lock);
- 			word_index = hard_iface->if_num * BATADV_NUM_WORDS;
- 			word = &(orig_node->bcast_own[word_index]);
- 
- 			batadv_bit_get_packet(bat_priv, word, 1, 0);
- 			w = &orig_node->bcast_own_sum[hard_iface->if_num];
- 			*w = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE);
- 			spin_unlock_bh(&orig_node->ogm_cnt_lock);
- 		}
- 		rcu_read_unlock();
- 	}
- }
- 
  static void _batadv_update_route(struct batadv_priv *bat_priv,
    			 struct batadv_orig_node *orig_node,
    			 struct batadv_neigh_node *neigh_node)
@@@ -256,7 -227,7 +227,7 @@@ bool batadv_check_management_packet(str
    if (unlikely(!pskb_may_pull(skb, header_len)))
    	return false;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
/* packet with broadcast indication but unicast recipient */
    if (!is_broadcast_ether_addr(ethhdr->h_dest))
@@@ -314,7 -285,7 +285,7 @@@ static int batadv_recv_my_icmp_packet(s
    icmp_packet->msg_type = BATADV_ECHO_REPLY;
    icmp_packet->header.ttl = BATADV_TTL;
- 	if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
    	ret = NET_RX_SUCCESS;
out:
@@@ -362,7 -333,7 +333,7 @@@ static int batadv_recv_icmp_ttl_exceede
    icmp_packet->msg_type = BATADV_TTL_EXCEEDED;
    icmp_packet->header.ttl = BATADV_TTL;
- 	if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
    	ret = NET_RX_SUCCESS;
out:
@@@ -392,7 -363,7 +363,7 @@@ int batadv_recv_icmp_packet(struct sk_b
    if (unlikely(!pskb_may_pull(skb, hdr_size)))
    	goto out;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
/* packet with unicast indication but broadcast recipient */
    if (is_broadcast_ether_addr(ethhdr->h_dest))
@@@ -439,7 -410,7 +410,7 @@@
    icmp_packet->header.ttl--;
/* route it */
- 	if (batadv_send_skb_to_orig(skb, orig_node, recv_if))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, recv_if) != NET_XMIT_DROP)
    	ret = NET_RX_SUCCESS;
out:
@@@ -569,7 -540,7 +540,7 @@@ static int batadv_check_unicast_packet(
    if (unlikely(!pskb_may_pull(skb, hdr_size)))
    	return -ENODATA;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
/* packet with unicast indication but broadcast recipient */
    if (is_broadcast_ether_addr(ethhdr->h_dest))
@@@ -803,8 -774,8 +774,8 @@@ static int batadv_route_unicast_packet(
    struct batadv_orig_node *orig_node = NULL;
    struct batadv_neigh_node *neigh_node = NULL;
    struct batadv_unicast_packet *unicast_packet;
- 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
- 	int ret = NET_RX_DROP;
+ 	struct ethhdr *ethhdr = eth_hdr(skb);
+ 	int res, ret = NET_RX_DROP;
    struct sk_buff *new_skb;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
@@@ -864,16 -835,19 +835,19 @@@
    /* decrement ttl */
    unicast_packet->header.ttl--;
- 	/* network code packet if possible */
- 	if (batadv_nc_skb_forward(skb, neigh_node, ethhdr)) {
- 		ret = NET_RX_SUCCESS;
- 	} else if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) {
- 		ret = NET_RX_SUCCESS;
+ 	res = batadv_send_skb_to_orig(skb, orig_node, recv_if);
- 		/* Update stats counter */
+ 	/* translate transmit result into receive result */
+ 	if (res == NET_XMIT_SUCCESS) {
+ 		/* skb was transmitted and consumed */
    	batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
    	batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
    			   skb->len + ETH_HLEN);
+ 
+ 		ret = NET_RX_SUCCESS;
+ 	} else if (res == NET_XMIT_POLICED) {
+ 		/* skb was buffered and consumed */
+ 		ret = NET_RX_SUCCESS;
    }
out:
@@@ -939,7 -913,7 +913,7 @@@ out
  }
static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,
- 				     struct sk_buff *skb) {
+ 				     struct sk_buff *skb, int hdr_len) {
    uint8_t curr_ttvn, old_ttvn;
    struct batadv_orig_node *orig_node;
    struct ethhdr *ethhdr;
@@@ -948,7 -922,7 +922,7 @@@
    int is_old_ttvn;
/* check if there is enough data before accessing it */
- 	if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0)
+ 	if (pskb_may_pull(skb, hdr_len + ETH_HLEN) < 0)
    	return 0;
/* create a copy of the skb (in case of for re-routing) to modify it. */
@@@ -956,7 -930,7 +930,7 @@@
    	return 0;
unicast_packet = (struct batadv_unicast_packet *)skb->data;
- 	ethhdr = (struct ethhdr *)(skb->data + sizeof(*unicast_packet));
+ 	ethhdr = (struct ethhdr *)(skb->data + hdr_len);
/* check if the destination client was served by this node and it is now
     * roaming. In this case, it means that the node has got a ROAM_ADV
@@@ -1072,8 -1046,7 +1046,7 @@@ int batadv_recv_unicast_packet(struct s
if (check < 0)
    	return NET_RX_DROP;
- 
- 	if (!batadv_check_unicast_ttvn(bat_priv, skb))
+ 	if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))
    	return NET_RX_DROP;
/* packet for me */
@@@ -1117,7 -1090,7 +1090,7 @@@ int batadv_recv_ucast_frag_packet(struc
    if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
    	return NET_RX_DROP;
- 	if (!batadv_check_unicast_ttvn(bat_priv, skb))
+ 	if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))
    	return NET_RX_DROP;
unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
@@@ -1166,7 -1139,7 +1139,7 @@@ int batadv_recv_bcast_packet(struct sk_
    if (unlikely(!pskb_may_pull(skb, hdr_size)))
    	goto out;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
/* packet with broadcast indication but unicast recipient */
    if (!is_broadcast_ether_addr(ethhdr->h_dest))
@@@ -1266,7 -1239,7 +1239,7 @@@ int batadv_recv_vis_packet(struct sk_bu
    	return NET_RX_DROP;
vis_packet = (struct batadv_vis_packet *)skb->data;
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
/* not for me */
    if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest))
diff --combined net/batman-adv/routing.h
index 99eeafa,72a29bd..72a29bd
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@@ -20,7 -20,6 +20,6 @@@
  #ifndef _NET_BATMAN_ADV_ROUTING_H_
  #define _NET_BATMAN_ADV_ROUTING_H_
- void batadv_slide_own_bcast_window(struct batadv_hard_iface *hard_iface);
  bool batadv_check_management_packet(struct sk_buff *skb,
    			    struct batadv_hard_iface *hard_iface,
    			    int header_len);
diff --combined net/batman-adv/send.c
index 263cfd1,e9ff8d8..e9ff8d8
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@@ -61,7 -61,7 +61,7 @@@ int batadv_send_skb_packet(struct sk_bu
skb_reset_mac_header(skb);
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
    memcpy(ethhdr->h_source, hard_iface->net_dev->dev_addr, ETH_ALEN);
    memcpy(ethhdr->h_dest, dst_addr, ETH_ALEN);
    ethhdr->h_proto = __constant_htons(ETH_P_BATMAN);
@@@ -96,26 -96,37 +96,37 @@@ send_skb_err
   * host, NULL can be passed as recv_if and no interface alternating is
   * attempted.
   *
-  * Returns TRUE on success; FALSE otherwise.
+  * Returns NET_XMIT_SUCCESS on success, NET_XMIT_DROP on failure, or
+  * NET_XMIT_POLICED if the skb is buffered for later transmit.
   */
- bool batadv_send_skb_to_orig(struct sk_buff *skb,
- 			     struct batadv_orig_node *orig_node,
- 			     struct batadv_hard_iface *recv_if)
+ int batadv_send_skb_to_orig(struct sk_buff *skb,
+ 			    struct batadv_orig_node *orig_node,
+ 			    struct batadv_hard_iface *recv_if)
  {
    struct batadv_priv *bat_priv = orig_node->bat_priv;
    struct batadv_neigh_node *neigh_node;
+ 	int ret = NET_XMIT_DROP;
/* batadv_find_router() increases neigh_nodes refcount if found. */
    neigh_node = batadv_find_router(bat_priv, orig_node, recv_if);
    if (!neigh_node)
- 		return false;
+ 		return ret;
- 	/* route it */
- 	batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
+ 	/* try to network code the packet, if it is received on an interface
+ 	 * (i.e. being forwarded). If the packet originates from this node or if
+ 	 * network coding fails, then send the packet as usual.
+ 	 */
+ 	if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) {
+ 		ret = NET_XMIT_POLICED;
+ 	} else {
+ 		batadv_send_skb_packet(skb, neigh_node->if_incoming,
+ 				       neigh_node->addr);
+ 		ret = NET_XMIT_SUCCESS;
+ 	}
batadv_neigh_node_free_ref(neigh_node);
- 	return true;
+ 	return ret;
  }
void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
@@@ -152,8 -163,6 +163,6 @@@ _batadv_add_bcast_packet_to_list(struc
    			 struct batadv_forw_packet *forw_packet,
    			 unsigned long send_time)
  {
- 	INIT_HLIST_NODE(&forw_packet->list);
- 
    /* add new packet to packet list */
    spin_lock_bh(&bat_priv->forw_bcast_list_lock);
    hlist_add_head(&forw_packet->list, &bat_priv->forw_bcast_list);
@@@ -260,6 -269,9 +269,9 @@@ static void batadv_send_outstanding_bca
    	if (hard_iface->soft_iface != soft_iface)
    		continue;
+ 		if (forw_packet->num_packets >= hard_iface->num_bcasts)
+ 			continue;
+ 
    	/* send a copy of the saved skb */
    	skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
    	if (skb1)
@@@ -271,7 -283,7 +283,7 @@@
    forw_packet->num_packets++;
/* if we still have some more bcasts to send */
- 	if (forw_packet->num_packets < 3) {
+ 	if (forw_packet->num_packets < BATADV_NUM_BCASTS_MAX) {
    	_batadv_add_bcast_packet_to_list(bat_priv, forw_packet,
    					 msecs_to_jiffies(5));
    	return;
diff --combined net/batman-adv/send.h
index 38e662f,e7b1788..e7b1788
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@@ -23,9 -23,9 +23,9 @@@
  int batadv_send_skb_packet(struct sk_buff *skb,
    		   struct batadv_hard_iface *hard_iface,
    		   const uint8_t *dst_addr);
- bool batadv_send_skb_to_orig(struct sk_buff *skb,
- 			     struct batadv_orig_node *orig_node,
- 			     struct batadv_hard_iface *recv_if);
+ int batadv_send_skb_to_orig(struct sk_buff *skb,
+ 			    struct batadv_orig_node *orig_node,
+ 			    struct batadv_hard_iface *recv_if);
  void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface);
  int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv,
    			    const struct sk_buff *skb,
diff --combined net/batman-adv/soft-interface.c
index 6f20d33,700d0b4..700d0b4
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -154,7 -154,7 +154,7 @@@ static int batadv_interface_tx(struct s
    					    0x00, 0x00};
    unsigned int header_len = 0;
    int data_len = skb->len, ret;
- 	short vid __maybe_unused = -1;
+ 	unsigned short vid __maybe_unused = BATADV_NO_FLAGS;
    bool do_bcast = false;
    uint32_t seqno;
    unsigned long brd_delay = 1;
@@@ -303,7 -303,7 +303,7 @@@ void batadv_interface_rx(struct net_dev
    struct ethhdr *ethhdr;
    struct vlan_ethhdr *vhdr;
    struct batadv_header *batadv_header = (struct batadv_header *)skb->data;
- 	short vid __maybe_unused = -1;
+ 	unsigned short vid __maybe_unused = BATADV_NO_FLAGS;
    __be16 ethertype = __constant_htons(ETH_P_BATMAN);
    bool is_bcast;
@@@ -316,7 -316,7 +316,7 @@@
    skb_pull_rcsum(skb, hdr_size);
    skb_reset_mac_header(skb);
- 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
+ 	ethhdr = eth_hdr(skb);
switch (ntohs(ethhdr->h_proto)) {
    case ETH_P_8021Q:
@@@ -505,6 -505,7 +505,7 @@@ unreg_debugfs
    batadv_debugfs_del_meshif(dev);
  free_bat_counters:
    free_percpu(bat_priv->bat_counters);
+ 	bat_priv->bat_counters = NULL;
return ret;
  }
diff --combined net/batman-adv/translation-table.c
index 5e89dee,429aeef..429aeef
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -144,7 -144,12 +144,12 @@@ static void batadv_tt_orig_list_entry_f
    struct batadv_tt_orig_list_entry *orig_entry;
orig_entry = container_of(rcu, struct batadv_tt_orig_list_entry, rcu);
- 	batadv_orig_node_free_ref(orig_entry->orig_node);
+ 
+ 	/* We are in an rcu callback here, therefore we cannot use
+ 	 * batadv_orig_node_free_ref() and its call_rcu():
+ 	 * An rcu_barrier() wouldn't wait for that to finish
+ 	 */
+ 	batadv_orig_node_free_ref_now(orig_entry->orig_node);
    kfree(orig_entry);
  }
@@@ -158,10 -163,19 +163,19 @@@ batadv_tt_orig_list_entry_free_ref(stru
    call_rcu(&orig_entry->rcu, batadv_tt_orig_list_entry_free_rcu);
  }
+ /**
+  * batadv_tt_local_event - store a local TT event (ADD/DEL)
+  * @bat_priv: the bat priv with all the soft interface information
+  * @tt_local_entry: the TT entry involved in the event
+  * @event_flags: flags to store in the event structure
+  */
  static void batadv_tt_local_event(struct batadv_priv *bat_priv,
- 				  const uint8_t *addr, uint8_t flags)
+ 				  struct batadv_tt_local_entry *tt_local_entry,
+ 				  uint8_t event_flags)
  {
    struct batadv_tt_change_node *tt_change_node, *entry, *safe;
+ 	struct batadv_tt_common_entry *common = &tt_local_entry->common;
+ 	uint8_t flags = common->flags | event_flags;
    bool event_removed = false;
    bool del_op_requested, del_op_entry;
@@@ -171,7 -185,7 +185,7 @@@
    	return;
tt_change_node->change.flags = flags;
- 	memcpy(tt_change_node->change.addr, addr, ETH_ALEN);
+ 	memcpy(tt_change_node->change.addr, common->addr, ETH_ALEN);
del_op_requested = flags & BATADV_TT_CLIENT_DEL;
@@@ -179,7 -193,7 +193,7 @@@
    spin_lock_bh(&bat_priv->tt.changes_list_lock);
    list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list,
    			 list) {
- 		if (!batadv_compare_eth(entry->change.addr, addr))
+ 		if (!batadv_compare_eth(entry->change.addr, common->addr))
    		continue;
/* DEL+ADD in the same orig interval have no effect and can be
@@@ -327,7 -341,7 +341,7 @@@ void batadv_tt_local_add(struct net_dev
    }
add_event:
- 	batadv_tt_local_event(bat_priv, addr, tt_local->common.flags);
+ 	batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS);
check_roaming:
    /* Check whether it is a roaming, but don't do anything if the roaming
@@@ -524,8 -538,7 +538,7 @@@ batadv_tt_local_set_pending(struct bata
    		    struct batadv_tt_local_entry *tt_local_entry,
    		    uint16_t flags, const char *message)
  {
- 	batadv_tt_local_event(bat_priv, tt_local_entry->common.addr,
- 			      tt_local_entry->common.flags | flags);
+ 	batadv_tt_local_event(bat_priv, tt_local_entry, flags);
/* The local client has to be marked as "pending to be removed" but has
     * to be kept in the table in order to send it in a full table
@@@ -579,8 -592,7 +592,7 @@@ uint16_t batadv_tt_local_remove(struct 
    /* if this client has been added right now, it is possible to
     * immediately purge it
     */
- 	batadv_tt_local_event(bat_priv, tt_local_entry->common.addr,
- 			      curr_flags | BATADV_TT_CLIENT_DEL);
+ 	batadv_tt_local_event(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL);
    hlist_del_rcu(&tt_local_entry->common.hash_entry);
    batadv_tt_local_entry_free_ref(tt_local_entry);
@@@ -786,10 -798,25 +798,25 @@@ out
    	batadv_tt_orig_list_entry_free_ref(orig_entry);
  }
- /* caller must hold orig_node refcount */
+ /**
+  * batadv_tt_global_add - add a new TT global entry or update an existing one
+  * @bat_priv: the bat priv with all the soft interface information
+  * @orig_node: the originator announcing the client
+  * @tt_addr: the mac address of the non-mesh client
+  * @flags: TT flags that have to be set for this non-mesh client
+  * @ttvn: the tt version number ever announcing this non-mesh client
+  *
+  * Add a new TT global entry for the given originator. If the entry already
+  * exists add a new reference to the given originator (a global entry can have
+  * references to multiple originators) and adjust the flags attribute to reflect
+  * the function argument.
+  * If a TT local entry exists for this non-mesh client remove it.
+  *
+  * The caller must hold orig_node refcount.
+  */
  int batadv_tt_global_add(struct batadv_priv *bat_priv,
    		 struct batadv_orig_node *orig_node,
- 			 const unsigned char *tt_addr, uint8_t flags,
+ 			 const unsigned char *tt_addr, uint16_t flags,
    		 uint8_t ttvn)
  {
    struct batadv_tt_global_entry *tt_global_entry;
@@@ -1595,11 -1622,11 +1622,11 @@@ batadv_tt_response_fill_table(uint16_t 
    tt_tot = tt_len / sizeof(struct batadv_tt_change);
len = tt_query_size + tt_len;
- 	skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);
+ 	skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
    if (!skb)
    	goto out;
- 	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);
+ 	skb_reserve(skb, ETH_HLEN);
    tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len);
    tt_response->ttvn = ttvn;
@@@ -1660,11 -1687,11 +1687,11 @@@ static int batadv_send_tt_request(struc
    if (!tt_req_node)
    	goto out;
- 	skb = dev_alloc_skb(sizeof(*tt_request) + ETH_HLEN + NET_IP_ALIGN);
+ 	skb = netdev_alloc_skb_ip_align(NULL, sizeof(*tt_request) + ETH_HLEN);
    if (!skb)
    	goto out;
- 	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);
+ 	skb_reserve(skb, ETH_HLEN);
tt_req_len = sizeof(*tt_request);
    tt_request = (struct batadv_tt_query_packet *)skb_put(skb, tt_req_len);
@@@ -1686,7 -1713,7 +1713,7 @@@
batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_TX);
- 	if (batadv_send_skb_to_orig(skb, dst_orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, dst_orig_node, NULL) != NET_XMIT_DROP)
    	ret = 0;
out:
@@@ -1710,7 -1737,7 +1737,7 @@@ batadv_send_other_tt_response(struct ba
    struct batadv_orig_node *req_dst_orig_node;
    struct batadv_orig_node *res_dst_orig_node = NULL;
    uint8_t orig_ttvn, req_ttvn, ttvn;
- 	int ret = false;
+ 	int res, ret = false;
    unsigned char *tt_buff;
    bool full_table;
    uint16_t tt_len, tt_tot;
@@@ -1757,11 -1784,11 +1784,11 @@@
    	tt_tot = tt_len / sizeof(struct batadv_tt_change);
len = sizeof(*tt_response) + tt_len;
- 		skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);
+ 		skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
    	if (!skb)
    		goto unlock;
- 		skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);
+ 		skb_reserve(skb, ETH_HLEN);
    	packet_pos = skb_put(skb, len);
    	tt_response = (struct batadv_tt_query_packet *)packet_pos;
    	tt_response->ttvn = req_ttvn;
@@@ -1805,8 -1832,10 +1832,10 @@@
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX);
- 	if (batadv_send_skb_to_orig(skb, res_dst_orig_node, NULL))
+ 	res = batadv_send_skb_to_orig(skb, res_dst_orig_node, NULL);
+ 	if (res != NET_XMIT_DROP)
    	ret = true;
+ 
    goto out;
unlock:
@@@ -1873,11 -1902,11 +1902,11 @@@ batadv_send_my_tt_response(struct batad
    	tt_tot = tt_len / sizeof(struct batadv_tt_change);
len = sizeof(*tt_response) + tt_len;
- 		skb = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);
+ 		skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
    	if (!skb)
    		goto unlock;
- 		skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);
+ 		skb_reserve(skb, ETH_HLEN);
    	packet_pos = skb_put(skb, len);
    	tt_response = (struct batadv_tt_query_packet *)packet_pos;
    	tt_response->ttvn = req_ttvn;
@@@ -1920,7 -1949,7 +1949,7 @@@
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_TX);
- 	if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
    	ret = true;
    goto out;
@@@ -2207,11 -2236,11 +2236,11 @@@ static void batadv_send_roam_adv(struc
    if (!batadv_tt_check_roam_count(bat_priv, client))
    	goto out;
- 	skb = dev_alloc_skb(sizeof(*roam_adv_packet) + ETH_HLEN + NET_IP_ALIGN);
+ 	skb = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
    if (!skb)
    	goto out;
- 	skb_reserve(skb, ETH_HLEN + NET_IP_ALIGN);
+ 	skb_reserve(skb, ETH_HLEN);
roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len);
@@@ -2233,7 -2262,7 +2262,7 @@@
batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_TX);
- 	if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
    	ret = 0;
out:
diff --combined net/batman-adv/translation-table.h
index ab8e683,659a3bb..659a3bb
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
@@@ -33,7 -33,7 +33,7 @@@ void batadv_tt_global_add_orig(struct b
    		       const unsigned char *tt_buff, int tt_buff_len);
  int batadv_tt_global_add(struct batadv_priv *bat_priv,
    		 struct batadv_orig_node *orig_node,
- 			 const unsigned char *addr, uint8_t flags,
+ 			 const unsigned char *addr, uint16_t flags,
    		 uint8_t ttvn);
  int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset);
  void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
diff --combined net/batman-adv/types.h
index aba8364,b2c94e1..b2c94e1
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@@ -61,6 -61,7 +61,7 @@@ struct batadv_hard_iface_bat_iv 
   * @if_status: status of the interface for batman-adv
   * @net_dev: pointer to the net_device
   * @frag_seqno: last fragment sequence number sent by this interface
+  * @num_bcasts: number of payload re-broadcasts on this interface (ARQ)
   * @hardif_obj: kobject of the per interface sysfs "mesh" directory
   * @refcount: number of contexts the object is used
   * @batman_adv_ptype: packet type describing packets that should be processed by
@@@ -76,6 -77,7 +77,7 @@@ struct batadv_hard_iface 
    char if_status;
    struct net_device *net_dev;
    atomic_t frag_seqno;
+ 	uint8_t num_bcasts;
    struct kobject *hardif_obj;
    atomic_t refcount;
    struct packet_type batman_adv_ptype;
@@@ -640,7 -642,7 +642,7 @@@ struct batadv_socket_packet 
  #ifdef CONFIG_BATMAN_ADV_BLA
  struct batadv_bla_backbone_gw {
    uint8_t orig[ETH_ALEN];
- 	short vid;
+ 	unsigned short vid;
    struct hlist_node hash_entry;
    struct batadv_priv *bat_priv;
    unsigned long lasttime;
@@@ -663,7 -665,7 +665,7 @@@
   */
  struct batadv_bla_claim {
    uint8_t addr[ETH_ALEN];
- 	short vid;
+ 	unsigned short vid;
    struct batadv_bla_backbone_gw *backbone_gw;
    unsigned long lasttime;
    struct hlist_node hash_entry;
diff --combined net/batman-adv/unicast.c
index 0bb3b59,dc8b5d4..dc8b5d4
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@@ -464,7 -464,7 +464,7 @@@ find_router
    	goto out;
    }
- 	if (batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
    	ret = 0;
out:
diff --combined net/batman-adv/vis.c
index 1625e57,4983340..4983340
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@@ -392,12 -392,12 +392,12 @@@ batadv_add_packet(struct batadv_priv *b
    	return NULL;
len = sizeof(*packet) + vis_info_len;
- 	info->skb_packet = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);
+ 	info->skb_packet = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
    if (!info->skb_packet) {
    	kfree(info);
    	return NULL;
    }
- 	skb_reserve(info->skb_packet, ETH_HLEN + NET_IP_ALIGN);
+ 	skb_reserve(info->skb_packet, ETH_HLEN);
    packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len);
kref_init(&info->refcount);
@@@ -697,7 -697,7 +697,7 @@@ static void batadv_broadcast_vis_packet
    struct batadv_orig_node *orig_node;
    struct batadv_vis_packet *packet;
    struct sk_buff *skb;
- 	uint32_t i;
+ 	uint32_t i, res;
packet = (struct batadv_vis_packet *)info->skb_packet->data;
@@@ -724,7 -724,8 +724,8 @@@
    		if (!skb)
    			continue;
- 			if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 			res = batadv_send_skb_to_orig(skb, orig_node, NULL);
+ 			if (res == NET_XMIT_DROP)
    			kfree_skb(skb);
    	}
    	rcu_read_unlock();
@@@ -748,7 -749,7 +749,7 @@@ static void batadv_unicast_vis_packet(s
    if (!skb)
    	goto out;
- 	if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+ 	if (batadv_send_skb_to_orig(skb, orig_node, NULL) == NET_XMIT_DROP)
    	kfree_skb(skb);
out:
@@@ -854,13 -855,13 +855,13 @@@ int batadv_vis_init(struct batadv_priv 
    if (!bat_priv->vis.my_info)
    	goto err;
- 	len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE;
- 	len += ETH_HLEN + NET_IP_ALIGN;
- 	bat_priv->vis.my_info->skb_packet = dev_alloc_skb(len);
+ 	len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN;
+ 	bat_priv->vis.my_info->skb_packet = netdev_alloc_skb_ip_align(NULL,
+ 								      len);
    if (!bat_priv->vis.my_info->skb_packet)
    	goto free_info;
- 	skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN + NET_IP_ALIGN);
+ 	skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN);
    tmp_skb = bat_priv->vis.my_info->skb_packet;
    packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet));
-- 
linux integration

    