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

On branch : next

commit 64fc7ed63afc8b16a5ca3a453c268eeaca3de137 Author: Antonio Quartulli ordex@autistici.org Date: Thu May 9 18:48:17 2013 +0200

batman-adv: use VLAN_VID_MASK instead of BATADV_VID_MASK

VLAN_VID_MASK is already diefined in linux/if_vlan.h and therefore does not need to be privately re-defined

Introduced in 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b ("batman-adv: change VID semantic in the BLA code")

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

64fc7ed63afc8b16a5ca3a453c268eeaca3de137 bridge_loop_avoidance.c | 2 +- main.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index e95cf4b..e9d8e0b 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -344,7 +344,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac,

if (vid & BATADV_VLAN_HAS_TAG) skb = vlan_insert_tag(skb, htons(ETH_P_8021Q), - vid & BATADV_VID_MASK); + vid & VLAN_VID_MASK);

skb_reset_mac_header(skb); skb->protocol = eth_type_trans(skb, soft_iface); diff --git a/main.h b/main.h index 8bcffa5..834b1a0 100644 --- a/main.h +++ b/main.h @@ -172,8 +172,6 @@ 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 & VLAN_VID_MASK) : -1)