[x86] change default kernel to 2.6.32.8, remove block2mtd patch until it is fixed

[openwrt.git] / target / linux / generic-2.4 / patches / 230-tun_get_user_backport.patch

diff --git a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
index acddc01..2fcfd23 100644 (file)
--- a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
+++ b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch
@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/include/linux/skbuff.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/skbuff.h
-+++ linux-2.4.35.4/include/linux/skbuff.h
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h

 @@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk
        skb->tail+=len;
  }
 @@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk
        skb->tail+=len;
  }


@@ -52,10 +50,8 @@ Index: linux-2.4.35.4/include/linux/skbuff.h
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)

-Index: linux-2.4.35.4/drivers/net/tun.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/tun.c
-+++ linux-2.4.35.4/drivers/net/tun.c
+--- a/drivers/net/tun.c
++++ b/drivers/net/tun.c

 @@ -185,22 +185,31 @@ static __inline__ ssize_t tun_get_user(s
  {
        struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };
 @@ -185,22 +185,31 @@ static __inline__ ssize_t tun_get_user(s
  {
        struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };