From: Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
To: The list for a Better Approach To Mobile Ad-hoc Networking
<b.a.t.m.a.n@lists.open-mesh.org>
Cc: Antonio Quartulli <antonio@open-mesh.org>,
Antonio Quartulli <antonio@open-mesh.com>
Subject: Re: [B.A.T.M.A.N.] [PATCH maint] batman-adv: set the TAG flag for the vid passed to BLA
Date: Wed, 11 Sep 2013 23:28:02 +0200 [thread overview]
Message-ID: <20130911212801.GA25911@pandem0nium> (raw)
In-Reply-To: <1378919684-374-1-git-send-email-antonio@meshcoding.com>
[-- 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 --]
next prev parent reply other threads:[~2013-09-11 21:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2013-09-17 14:14 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130911212801.GA25911@pandem0nium \
--to=simon.wunderlich@s2003.tu-chemnitz.de \
--cc=antonio@open-mesh.com \
--cc=antonio@open-mesh.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox