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

On branch : master

commit 919495e481cf988cbe674de8c7fc09834e07502e Merge: c941378 4669c9c Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Apr 16 22:09:08 2013 +0800

Merge branch 'next'

919495e481cf988cbe674de8c7fc09834e07502e main.c | 5 ++++- main.h | 2 +- routing.c | 38 ++++++++++++++++++++------------------ translation-table.c | 2 +- vis.c | 4 ++-- 5 files changed, 28 insertions(+), 23 deletions(-)

diff --cc routing.c index 1d826a8,addeff8..ae914c7 --- a/routing.c +++ b/routing.c @@@ -1263,10 -1265,10 +1265,10 @@@ 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(ethhdr->h_dest)) + if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest)) return NET_RX_DROP;

/* ignore own packets */