From: Florian Westphal <fw@strlen.de>
To: Stephane Bryant <stephane.ml.bryant@gmail.com>
Cc: pablo@netfilter.org, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf-next 3/3] netfilter: bridge: copy back VLAN header for bridge packet queued to userspace
Date: Fri, 15 Jan 2016 11:06:28 +0100 [thread overview]
Message-ID: <20160115100628.GB7462@breakpoint.cc> (raw)
In-Reply-To: <1452847734-3766-4-git-send-email-stephane.ml.bryant@gmail.com>
Stephane Bryant <stephane.ml.bryant@gmail.com> wrote:
> From: stephane <stephane.ml.bryant@gmail.com>
>
> For bridge packets queued to userspace, this uses the skb tci info
> to reinstate the VLAN header, and conversely parses and removes it
> to fill the tci info on the way back.
> - * it gets copied in
> - */
> mac_header_len =
> (int)(entskb->data - skb_mac_header(entskb));
> - skb_push(entskb, mac_header_len);
> + if (skb_vlan_tag_present(entskb))
> + vlan_len = VLAN_HLEN;
I wondered if we could use the saveroute and reroute hooks in the nf
afinfo to perform the push/pull.
It would keep the bridge specific parts out of the generic code.
Thanks for working on this!
next prev parent reply other threads:[~2016-01-15 10:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 8:48 [PATCH nf-next 0/3] netfilter: bridge: add queuing to userspace for AF_BRIDGE family Stephane Bryant
2016-01-15 8:48 ` [PATCH nf-next 1/3] netfilter: bridge: add nf_afinfo to enable queuing to userspace Stephane Bryant
2016-01-15 9:06 ` kbuild test robot
2016-01-15 9:49 ` Florian Westphal
2016-01-20 14:34 ` stéphane bryant
2016-01-20 15:52 ` Florian Westphal
2016-01-15 8:48 ` [PATCH nf-next 2/3] netfilter: bridge: pull back mac header into skb queued " Stephane Bryant
2016-01-15 8:48 ` [PATCH nf-next 3/3] netfilter: bridge: copy back VLAN header for bridge packet " Stephane Bryant
2016-01-15 10:06 ` Florian Westphal [this message]
2016-01-15 10:49 ` Florian Westphal
2016-01-15 11:02 ` Pablo Neira Ayuso
2016-01-15 14:04 ` Florian Westphal
2016-01-15 16:33 ` Pablo Neira Ayuso
2016-01-16 11:00 ` stéphane bryant
2016-01-16 11:06 ` Florian Westphal
2016-01-23 9:30 ` stéphane bryant
2016-01-23 20:39 ` Florian Westphal
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=20160115100628.GB7462@breakpoint.cc \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=stephane.ml.bryant@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).