lkml.org 
[lkml]   [2003]   [Dec]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: 2.6.0-rc1-mm1
On Dec-31 2003, Wed, 02:57 -0800
Andrew Morton <akpm@osdl.org> wrote:

> Tomas Szepe <szepe@pinerecords.com> wrote:
> >
> > What I did was:
>
> Well that just reverts the recent change back to the way it was. I assume
> that change was made for a reason. But with such a lame changelog I am not
> able to say what it was. No doubt Dave will hunt down the perps ;)

Let's not drag Dave out of bed. :)
Here's the explanation (and a fix) from Bart De Schuymer.

--
Tomas Szepe <szepe@pinerecords.com>

From: Bart De Schuymer <bdschuym@pandora.be>
To: "David S.Miller" <davem@redhat.com>
Cc: netdev <netdev@oss.sgi.com>, Tomas Szepe <szepe@pinerecords.com>
Subject: [PATCH] Always copy and save the vlan header in bridge-nf (do it right now)
Date: Wed, 31 Dec 2003 11:56:11 +0100

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

\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.109 / U:0.368 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site