## Automatically generated incremental diff ## From: linux-2.4.22-bk32 ## To: linux-2.4.22-bk33 ## Robot: $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $ diff -urN linux-2.4.22-bk32/Makefile linux-2.4.22-bk33/Makefile --- linux-2.4.22-bk32/Makefile 2003-10-11 02:49:21.000000000 -0700 +++ linux-2.4.22-bk33/Makefile 2003-10-11 02:49:26.000000000 -0700 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 4 SUBLEVEL = 22 -EXTRAVERSION = -bk32 +EXTRAVERSION = -bk33 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) diff -urN linux-2.4.22-bk32/include/linux/in.h linux-2.4.22-bk33/include/linux/in.h --- linux-2.4.22-bk32/include/linux/in.h 2003-10-11 02:49:24.000000000 -0700 +++ linux-2.4.22-bk33/include/linux/in.h 2003-10-11 02:49:27.000000000 -0700 @@ -19,6 +19,7 @@ #define _LINUX_IN_H #include +#include /* Standard well-defined IP protocols. */ enum { diff -urN linux-2.4.22-bk32/net/8021q/vlan_dev.c linux-2.4.22-bk33/net/8021q/vlan_dev.c --- linux-2.4.22-bk32/net/8021q/vlan_dev.c 2003-10-11 02:49:24.000000000 -0700 +++ linux-2.4.22-bk33/net/8021q/vlan_dev.c 2003-10-11 02:49:27.000000000 -0700 @@ -77,7 +77,7 @@ if (VLAN_DEV_INFO(skb->dev)->flags & 1) { if (skb_shared(skb) || skb_cloned(skb)) { struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC); - kfree(skb); + kfree_skb(skb); skb = nskb; } if (skb) {