Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 3d1c46ea151185574935673859d0776bf38ab8fd Merge: 919495e 8746974 Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Apr 17 00:35:51 2013 +0800

Merge branch 'next'

3d1c46ea151185574935673859d0776bf38ab8fd main.c | 6 ++++++ network-coding.c | 18 ++++++++++-------- routing.c | 1 + 3 files changed, 17 insertions(+), 8 deletions(-)

diff --cc network-coding.c index 80fe2ea,4eb49fc..c93df9e --- a/network-coding.c +++ b/network-coding.c @@@ -1482,9 -1482,9 +1482,9 @@@ 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(ethhdr->h_dest)) + if (batadv_is_my_mac(bat_priv, ethhdr->h_dest)) return;

/* Set data pointer to MAC header to mimic packets from our tx path */ @@@ -1672,11 -1674,11 +1674,11 @@@ 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(ethhdr->h_dest) && - !batadv_is_my_mac(coded_packet->second_dest)) + if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest) && + !batadv_is_my_mac(bat_priv, coded_packet->second_dest)) return NET_RX_DROP;

/* Update stat counter */