argh, sorry, stupid.
diff -puN net/core/dev.c~handle_bridge-fix net/core/dev.c
--- 25/net/core/dev.c~handle_bridge-fix 2003-05-13 00:10:47.000000000 -0700
+++ 25-akpm/net/core/dev.c 2003-05-13 00:10:57.000000000 -0700
@@ -1491,7 +1491,7 @@ static inline void handle_diverter(struc
#endif
}
-static inline int handle_bridge(struct sk_buff *skb,
+static inline int __handle_bridge(struct sk_buff *skb,
struct packet_type **pt_prev, int *ret)
{
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
@@ -1548,7 +1548,7 @@ int netif_receive_skb(struct sk_buff *sk
handle_diverter(skb);
- if (handle_bridge(skb, &pt_prev, &ret))
+ if (__handle_bridge(skb, &pt_prev, &ret))
goto out;
list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type)&15], list) {
_
-
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/