- added fixes to kernel 2.2 patch (integrated from kernel-vlan.patch)

Changed files:
    linux-vlan-fixpatch.patch -> 1.2

diff --git a/linux-vlan-fixpatch.patch b/linux-vlan-fixpatch.patch
index 30a8f2e2baa39700b2bb5ba29c9658633a405402..ebbae62823c079954c6ea0f78a0011637b5db76e 100644 (file)
--- a/linux-vlan-fixpatch.patch
+++ b/linux-vlan-fixpatch.patch
@@ -10,4 +10,46 @@
 + subdir-$(CONFIG_IPSEC)               += ipsec
  +subdir-$(CONFIG_VLAN_8021Q)           += 8021q
   
+
+diff -uNr vlan.1.0.1.orig/vlan_2.2.patch vlan.1.0.1/vlan_2.2.patch
+--- vlan.1.0.1.orig/vlan_2.2.patch     Tue Apr 17 06:51:45 2001
++++ vlan.1.0.1/vlan_2.2.patch  Sat Jun 23 20:32:09 2001
+@@ -2385,15 +2385,16 @@
+  MOD_SUB_DIRS := ipv4
+  ALL_SUB_DIRS := 802 ax25 bridge core ethernet ipv4 ipv6 ipx unix appletalk \
+               netrom rose lapb x25 wanrouter netlink sched packet sunrpc \
+--             econet irda #decnet
+-+             econet irda 802_1Q #decnet
++-             econet irda atm #decnet
+++             econet irda atm 802_1Q #decnet
+  SUB_DIRS     := core ethernet sched
+  MOD_LIST_NAME := NET_MISC_MODULES
+  
+-@@ -59,6 +59,10 @@
+- 
+- ifeq ($(CONFIG_BRIDGE),y)
+- SUB_DIRS += bridge
++@@ -62,6 +62,10 @@
++ else 
++   ifeq ($(CONFIG_BRIDGE),m)
++     MOD_SUB_DIRS += bridge
++   endif
+ +endif
+ +
+ +ifeq ($(CONFIG_VLAN_802_1Q),y)
+@@ -2766,15 +2767,6 @@
+  }
+   
+  struct device *dev_alloc(const char *name, int *err)
+-@@ -830,7 +1127,7 @@
+-              if(skb==NULL)           
+-                      return;
+-                      
+--             offset=skb->data-skb->mac.raw;
+-+             offset = skb->data - skb->mac.raw;
+-              skb_push(skb,offset);   /* Put header back on for bridge */
+- 
+-              if(br_receive_frame(skb))
+ @@ -956,7 +1253,7 @@
+               }