[linux-merge]linux integration; branch, merge/master, updated. v3.10-rc1-1781-g99f6df1 - commits - lists.open-mesh.org

17 May 2013

The following commit has been merged in the merge/master branch:
commit 99f6df123026c77e416fdec60aadbdc28375c0e7
Merge: 048202d71c245271fe758755504ff875f547446f f722406faae2d073cc1d01063d1123c35425939e
Author: Antonio Quartulli ordex@autistici.org
Date:   Fri May 17 09:05:07 2013 +0200
Merge commit 'f722406faae2d073cc1d01063d1123c35425939e' into merge/master
(Linux v3.10-rc1 - tag did not exist in net-next)
Conflicts:
    	net/batman-adv/bridge_loop_avoidance.c
    	net/batman-adv/main.h
    	net/batman-adv/network-coding.c
    	net/batman-adv/network-coding.h
    	net/batman-adv/routing.c
    	net/batman-adv/soft-interface.c
diff --combined net/batman-adv/bridge_loop_avoidance.c
index 605c3ac,379061c..e95cf4b

--- 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,8 -307,7 +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
@@@ -317,7 -316,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
@@@ -326,7 -325,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
@@@ -336,14 -335,13 +336,15 @@@
    	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, htons(ETH_P_8021Q), vid);
 +	if (vid & BATADV_VLAN_HAS_TAG)
- 		skb = vlan_insert_tag(skb, vid & BATADV_VID_MASK);
++		skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
++				      vid & BATADV_VID_MASK);
skb_reset_mac_header(skb);
    skb->protocol = eth_type_trans(skb, soft_iface);
@@@ -369,7 -367,7 +370,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;
@@@ -382,7 -380,7 +383,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)
@@@ -436,7 -434,7 +437,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;
@@@ -458,7 -456,7 +459,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;
@@@ -549,7 -547,7 +550,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;
@@@ -574,7 -572,7 +575,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,
@@@ -593,7 -591,7 +594,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);
@@@ -613,7 -611,7 +614,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;
@@@ -624,7 -622,7 +625,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);
@@@ -639,7 -637,7 +640,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;
@@@ -660,13 -658,12 +661,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);
@@@ -688,7 -685,7 +689,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))
@@@ -702,7 -699,7 +703,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;
@@@ -712,7 -709,7 +713,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;
@@@ -730,7 -727,7 +731,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);
@@@ -741,7 -738,7 +742,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;
@@@ -864,15 -861,14 +865,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 {
@@@ -889,7 -885,7 +890,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
@@@ -914,8 -910,7 +915,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;
@@@ -950,7 -945,7 +951,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;
  }
@@@ -1363,7 -1358,7 +1364,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;
@@@ -1380,7 -1375,6 +1381,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 */
@@@ -1430,15 -1424,15 +1431,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)
@@@ -1525,8 -1519,7 +1526,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;
@@@ -1546,7 -1539,7 +1547,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 */
@@@ -1630,8 -1623,8 +1631,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);
@@@ -1683,10 -1676,10 +1684,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/routing.c
index 2f0bd3f,b27a4d7..dcfae83
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@@ -34,6 -34,35 +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)
@@@ -227,7 -256,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))
@@@ -285,7 -314,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:
@@@ -333,7 -362,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:
@@@ -363,7 -392,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))
@@@ -410,7 -439,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:
@@@ -540,7 -569,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))
@@@ -774,8 -803,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;
@@@ -835,21 -864,18 +835,27 @@@
    /* decrement ttl */
    unicast_packet->header.ttl--;
-	/* network code packet if possible */
 -	if (batadv_nc_skb_forward(skb, neigh_node, ethhdr)) {
 +	res = batadv_send_skb_to_orig(skb, orig_node, recv_if);
 +
 +	/* 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 (batadv_send_skb_to_orig(skb, orig_node, recv_if)) {
 +	} else if (res == NET_XMIT_POLICED) {
 +		/* skb was buffered and consumed */
    	ret = NET_RX_SUCCESS;
 +	}
+ 		/* Update stats counter */
+ 		batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);
+ 		batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,
+ 				   skb->len + ETH_HLEN);
+ 	}
+ 
  out:
    if (neigh_node)
    	batadv_neigh_node_free_ref(neigh_node);
@@@ -1139,7 -1165,7 +1145,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))
@@@ -1239,7 -1265,7 +1245,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))
-- 
linux integration

    