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

On branch : next

commit 7996b589531b62189fea0a89e04165fc49042947 Merge: 675fbb4 82d1a8e Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Apr 25 00:49:20 2013 +0800

Merge branch 'maint' into next

Conflicts: bridge_loop_avoidance.c

7996b589531b62189fea0a89e04165fc49042947 bridge_loop_avoidance.c | 3 ++- compat.h | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-)

diff --cc bridge_loop_avoidance.c index 605c3ac,379061c..cc530a7 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@@ -342,8 -340,8 +342,9 @@@ static void batadv_bla_send_claim(struc 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);