Re: 2.6.0-rc1-mm1

[Bart De Schuymer]

On Wednesday 31 December 2003 11:49, Tomas Szepe wrote:
> On Dec-31 2003, Wed, 02:48 -0800
>
> Andrew Morton <akpm@xxxxxxxx> wrote:
> > Tomas Szepe <szepe@xxxxxxxxxxxxxxx> wrote:
> > > In file included from include/linux/netfilter_bridge/ebtables.h:16,
> > >                  from net/bridge/netfilter/ebtables.c:25:
> > > include/linux/netfilter_bridge.h: In function
> > > `nf_bridge_maybe_copy_header': include/linux/netfilter_bridge.h:74:
> > > error: `ETH_P_8021Q' undeclared (first use in this function)
> >
> > This problem also exists in 2.6.1-rc1.
>
> Andrew, are you quite sure this is the correct fix?

I've sent this fix to David Miller, please don't apply any other "fix":

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. */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/