[B.A.T.M.A.N.] [PATCH next 1/2] batman-adv: use VLAN_VID_MASK instead of BATADV_VID_MASK

[B.A.T.M.A.N.] [PATCH next 1/2] batman-adv: use VLAN_VID_MASK instead of BATADV_VID_MASK

[Antonio Quartulli]

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>
---
 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 d575436..68c7ee0 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 & BATADV_VID_MASK) : -1)
 
-- 
1.8.1.5

[B.A.T.M.A.N.] [PATCH next 2/2] batman-adv: use VLAN_VID_MASK when printing the vid

[Antonio Quartulli]

Introduced in 454b849c7de18a7b44eecebe889f5f3149d24780
("batman-adv: print the VID properly")

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.h b/main.h
index 68c7ee0..834b1a0 100644
--- a/main.h
+++ b/main.h
@@ -173,7 +173,7 @@ enum batadv_vlan_flags {
 };
 
 #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \
-			       (int)(vid & BATADV_VID_MASK) : -1)
+			       (int)(vid & VLAN_VID_MASK) : -1)
 
 extern char batadv_routing_algo[];
 extern struct list_head batadv_hardif_list;
-- 
1.8.1.5

Re: [B.A.T.M.A.N.] [PATCH next 1/2] batman-adv: use VLAN_VID_MASK instead of BATADV_VID_MASK

[Marek Lindner]

On Thursday, May 09, 2013 22:28:06 Antonio Quartulli wrote:
> --- 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 & BATADV_VID_MASK) : -1)

The last user should remove the define otherwise the code won't compile.

Cheers,
Marek

Re: [B.A.T.M.A.N.] [PATCH next 1/2] batman-adv: use VLAN_VID_MASK instead of BATADV_VID_MASK

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

On Fri, May 10, 2013 at 12:09:11AM +0800, Marek Lindner wrote:
> On Thursday, May 09, 2013 22:28:06 Antonio Quartulli wrote:
> > --- 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 & BATADV_VID_MASK) : -1)
> 
> The last user should remove the define otherwise the code won't compile.

oh, ok, will send v2 with the patches in the other order.

Cheers,

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]