1 diff -urN linux.orig/vlan.1.0.1/vlan_2.2.patch linux/vlan.1.0.1/vlan_2.2.patch
2 --- linux.orig/vlan.1.0.1/vlan_2.2.patch Tue Apr 17 04:51:45 2001
3 +++ linux/vlan.1.0.1/vlan_2.2.patch Sun Jan 20 17:30:50 2002
4 @@ -2390,17 +2390,17 @@
5 SUB_DIRS := core ethernet sched
6 MOD_LIST_NAME := NET_MISC_MODULES
13 - ifeq ($(CONFIG_BRIDGE),y)
17 +ifeq ($(CONFIG_VLAN_802_1Q),y)
23 ifeq ($(CONFIG_IPX),y)
25 + # SPX can be still a module
26 diff -u -r -N -X /home/greear/exclude.list linux/net/core/dev.c linux.dev/net/core/dev.c
27 --- linux/net/core/dev.c Sun Dec 10 17:49:44 2000
28 +++ linux.dev/net/core/dev.c Sun Jan 14 14:16:43 2001
29 @@ -2766,15 +2766,6 @@
32 struct device *dev_alloc(const char *name, int *err)
37 -- offset=skb->data-skb->mac.raw;
38 -+ offset = skb->data - skb->mac.raw;
39 - skb_push(skb,offset); /* Put header back on for bridge */
41 - if(br_receive_frame(skb))