* [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA
@ 2013-09-11 17:14 Antonio Quartulli
2013-09-11 21:28 ` Simon Wunderlich
2013-09-17 14:14 ` Marek Lindner
0 siblings, 2 replies; 3+ messages in thread
From: Antonio Quartulli @ 2013-09-11 17:14 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli, Antonio Quartulli
From: Antonio Quartulli <antonio@open-mesh.com>
When receiving or sending a packet a packet on a VLAN, the
vid has to be marked with the TAG flag in order to make any
component in batman-adv understand that the packet is coming
from a really tagged network.
This fix the Bridge Loop Avoidance behaviour which was not
able to send announces over VLAN interfaces.
Introduced by 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b
("batman-adv: change VID semantic in the BLA code")
Signed-off-by: Antonio Quartulli <antonio@open-mesh.org>
---
soft-interface.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/soft-interface.c b/soft-interface.c
index 0f04e1c..33b6144 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -168,6 +168,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
case ETH_P_8021Q:
vhdr = (struct vlan_ethhdr *)skb->data;
vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
+ vid |= BATADV_VLAN_HAS_TAG;
if (vhdr->h_vlan_encapsulated_proto != ethertype)
break;
@@ -329,6 +330,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
case ETH_P_8021Q:
vhdr = (struct vlan_ethhdr *)skb->data;
vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
+ vid |= BATADV_VLAN_HAS_TAG;
if (vhdr->h_vlan_encapsulated_proto != ethertype)
break;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA
2013-09-11 17:14 [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA Antonio Quartulli
@ 2013-09-11 21:28 ` Simon Wunderlich
2013-09-17 14:14 ` Marek Lindner
1 sibling, 0 replies; 3+ messages in thread
From: Simon Wunderlich @ 2013-09-11 21:28 UTC (permalink / raw)
To: The list for a Better Approach To Mobile Ad-hoc Networking
Cc: Antonio Quartulli, Antonio Quartulli
[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]
Looks good - thanks for fixing that.
Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
On Wed, Sep 11, 2013 at 07:14:44PM +0200, Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
>
> When receiving or sending a packet a packet on a VLAN, the
> vid has to be marked with the TAG flag in order to make any
> component in batman-adv understand that the packet is coming
> from a really tagged network.
>
> This fix the Bridge Loop Avoidance behaviour which was not
> able to send announces over VLAN interfaces.
>
> Introduced by 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b
> ("batman-adv: change VID semantic in the BLA code")
>
> Signed-off-by: Antonio Quartulli <antonio@open-mesh.org>
> ---
> soft-interface.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/soft-interface.c b/soft-interface.c
> index 0f04e1c..33b6144 100644
> --- a/soft-interface.c
> +++ b/soft-interface.c
> @@ -168,6 +168,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
> case ETH_P_8021Q:
> vhdr = (struct vlan_ethhdr *)skb->data;
> vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
> + vid |= BATADV_VLAN_HAS_TAG;
>
> if (vhdr->h_vlan_encapsulated_proto != ethertype)
> break;
> @@ -329,6 +330,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
> case ETH_P_8021Q:
> vhdr = (struct vlan_ethhdr *)skb->data;
> vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;
> + vid |= BATADV_VLAN_HAS_TAG;
>
> if (vhdr->h_vlan_encapsulated_proto != ethertype)
> break;
> --
> 1.8.1.5
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA
2013-09-11 17:14 [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA Antonio Quartulli
2013-09-11 21:28 ` Simon Wunderlich
@ 2013-09-17 14:14 ` Marek Lindner
1 sibling, 0 replies; 3+ messages in thread
From: Marek Lindner @ 2013-09-17 14:14 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli, Antonio Quartulli
On Wednesday 11 September 2013 19:14:44 Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
>
> When receiving or sending a packet a packet on a VLAN, the
> vid has to be marked with the TAG flag in order to make any
> component in batman-adv understand that the packet is coming
> from a really tagged network.
>
> This fix the Bridge Loop Avoidance behaviour which was not
> able to send announces over VLAN interfaces.
>
> Introduced by 0b1da1765fdb00ca5d53bc95c9abc70dfc9aae5b
> ("batman-adv: change VID semantic in the BLA code")
>
> Signed-off-by: Antonio Quartulli <antonio@open-mesh.org>
> ---
> soft-interface.c | 2 ++
> 1 file changed, 2 insertions(+)
Applied in revision 5922104.
Thanks,
Marek
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-17 14:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 17:14 [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA Antonio Quartulli
2013-09-11 21:28 ` Simon Wunderlich
2013-09-17 14:14 ` Marek Lindner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox