Florian Westphal <fw@xxxxxxxxx> wrote: > Stephane Bryant <stephane.ml.bryant@xxxxxxxxx> wrote: > > From: stephane <stephane.ml.bryant@xxxxxxxxx> > > > > 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. Addendum: If its not possible I'd prefer to add afinfo helpers for it to keep this out of the generic part. F.e. we will likely also want netdev family support later on. As for complications wrt. nf_bridge_adjust_skb_data() (the software segmentation part) I think the best way would be to reject attempts to bind a queue for families other than NFPROTO_IPV4|6 without NFQA_CFG_F_GSO flag present. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
