* [PATCH]
@ 2003-12-27 13:50 Bart De Schuymer
2003-12-30 1:52 ` [PATCH] Always copy and save the vlan header in bridge-nf David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Bart De Schuymer @ 2003-12-27 13:50 UTC (permalink / raw)
To: David S.Miller; +Cc: netdev, Stephen Hemminger
Hi Dave,
We should also filter vlan-tagged IP/ARP traffic even if the vlan code
isn't compiled into the kernel. The patch below removes an unnecessary
dependence on the vlan code being compiled.
cheers,
Bart
--- linux-2.6.0/include/linux/netfilter_bridge.h.earlier 2003-12-25 17:01:38.000000000 +0100
+++ linux-2.6.0/include/linux/netfilter_bridge.h 2003-12-25 17:02:56.000000000 +0100
@@ -71,12 +71,10 @@ static inline
void nf_bridge_maybe_copy_header(struct sk_buff *skb)
{
if (skb->nf_bridge) {
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
memcpy(skb->data - 18, skb->nf_bridge->data, 18);
skb_push(skb, 4);
} else
-#endif
memcpy(skb->data - 16, skb->nf_bridge->data, 16);
}
}
@@ -86,10 +84,9 @@ void nf_bridge_save_header(struct sk_buf
{
int header_size = 16;
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
if (skb->protocol == __constant_htons(ETH_P_8021Q))
header_size = 18;
-#endif
+
memcpy(skb->nf_bridge->data, skb->data - header_size, header_size);
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] Always copy and save the vlan header in bridge-nf
2003-12-27 13:50 [PATCH] Bart De Schuymer
@ 2003-12-30 1:52 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2003-12-30 1:52 UTC (permalink / raw)
To: Bart De Schuymer; +Cc: netdev, shemminger
On Sat, 27 Dec 2003 14:50:18 +0100
Bart De Schuymer <bdschuym@pandora.be> wrote:
> We should also filter vlan-tagged IP/ARP traffic even if the vlan code
> isn't compiled into the kernel. The patch below removes an unnecessary
> dependence on the vlan code being compiled.
Applied, thanks Bart.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-12-30 1:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-12-27 13:50 [PATCH] Bart De Schuymer
2003-12-30 1:52 ` [PATCH] Always copy and save the vlan header in bridge-nf David S. Miller
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).