netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Always copy and save the vlan header in bridge-nf (do it right now)
@ 2003-12-31 10:56 Bart De Schuymer
  2003-12-31 18:32 ` David S. Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Bart De Schuymer @ 2003-12-31 10:56 UTC (permalink / raw)
  To: David S.Miller; +Cc: netdev, Tomas Szepe

Hi Dave,

I forgot to get rid of another ifdef in netfilter_bridge.h when I removed
the dependency upon vlan being compiled. This patch fixes it.

cheers,
Bart

--- linux-2.6.0-bk3/include/linux/netfilter_bridge.h.earlier	2003-12-31 11:54:25.000000000 +0100
+++ linux-2.6.0-bk3/include/linux/netfilter_bridge.h	2003-12-31 11:54:47.000000000 +0100
@@ -8,10 +8,8 @@
 #include <linux/netfilter.h>
 #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER)
 #include <asm/atomic.h>
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_ether.h>
 #endif
-#endif
 
 /* Bridge Hooks */
 /* After promisc drops, checksum checks. */

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Always copy and save the vlan header in bridge-nf (do it right now)
  2003-12-31 10:56 [PATCH] Always copy and save the vlan header in bridge-nf (do it right now) Bart De Schuymer
@ 2003-12-31 18:32 ` David S. Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2003-12-31 18:32 UTC (permalink / raw)
  To: Bart De Schuymer; +Cc: netdev, szepe

On Wed, 31 Dec 2003 11:56:11 +0100
Bart De Schuymer <bdschuym@pandora.be> wrote:

> I forgot to get rid of another ifdef in netfilter_bridge.h when I removed
> the dependency upon vlan being compiled. This patch fixes it.

Applied, thanks Bart.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2003-12-31 18:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-12-31 10:56 [PATCH] Always copy and save the vlan header in bridge-nf (do it right now) Bart De Schuymer
2003-12-31 18:32 ` 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).