Re: 2.6.0-rc1-mm1

[Tomas Szepe <szepe@pinerecords.com>]

On Dec-31 2003, Wed, 02:48 -0800
Andrew Morton <akpm@osdl.org> wrote:

> Tomas Szepe <szepe@pinerecords.com> 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?

What I did was:

--- b/include/linux/netfilter_bridge.h	2003-12-31 11:47:06.000000000 +0100
+++ linux-2.6.0/include/linux/netfilter_bridge.h	2003-12-31 11:46:08.000000000 +0100
@@ -71,10 +71,12 @@
 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->hh, 18);
 			skb_push(skb, 4);
 		} else
+#endif
 			memcpy(skb->data - 16, skb->nf_bridge->hh, 16);
 	}
 }
@@ -84,8 +86,10 @@
 {
         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->hh, skb->data - header_size, header_size);
 }
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"aart@kvack.org"> aart@kvack.org </a>