1 --- vlan.1.0.1/vlan_2.4.patch~ Tue Apr 17 06:51:45 2001
2 +++ vlan.1.0.1/vlan_2.4.patch Mon May 28 17:17:21 2001
4 --- linux/net/Makefile Fri Dec 29 15:07:24 2000
5 +++ linux.dev/net/Makefile Sun Apr 15 14:48:09 2001
7 - subdir-$(CONFIG_ATM) += atm
8 subdir-$(CONFIG_DECNET) += decnet
9 subdir-$(CONFIG_ECONET) += econet
10 + subdir-$(CONFIG_IPSEC) += ipsec
11 +subdir-$(CONFIG_VLAN_8021Q) += 8021q
14 diff -uNr vlan.1.0.1.orig/vlan_2.2.patch vlan.1.0.1/vlan_2.2.patch
15 --- vlan.1.0.1.orig/vlan_2.2.patch Tue Apr 17 06:51:45 2001
16 +++ vlan.1.0.1/vlan_2.2.patch Sat Jun 23 20:32:09 2001
17 @@ -2385,15 +2385,16 @@
19 ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
20 netrom rose lapb x25 wanrouter netlink sched packet sunrpc \
21 -- econet irda #decnet
22 -+ econet irda 802_1Q #decnet
23 +- econet irda atm #decnet
24 ++ econet irda atm 802_1Q #decnet
25 SUB_DIRS := core ethernet sched
26 MOD_LIST_NAME := NET_MISC_MODULES
30 - ifeq ($(CONFIG_BRIDGE),y)
34 + ifeq ($(CONFIG_BRIDGE),m)
35 + MOD_SUB_DIRS += bridge
39 +ifeq ($(CONFIG_VLAN_802_1Q),y)
40 @@ -2766,15 +2767,6 @@
43 struct device *dev_alloc(const char *name, int *err)
48 -- offset=skb->data-skb->mac.raw;
49 -+ offset = skb->data - skb->mac.raw;
50 - skb_push(skb,offset); /* Put header back on for bridge */
52 - if(br_receive_frame(skb))