kernel: if block2mtd does not find the device immediately, use wait_for_device_probe...

[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 a671d1a..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,8 +1,6 @@
-Index: linux-2.4.35.4/include/linux/skbuff.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/skbuff.h 2007-12-15 05:19:38.654623841 +0100
-+++ linux-2.4.35.4/include/linux/skbuff.h      2007-12-15 05:20:05.060128604 +0100
-@@ -912,6 +912,49 @@
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk

        skb->tail+=len;
  }
  
        skb->tail+=len;
  }
  


@@ -52,11 +50,9 @@ 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      2007-12-15 05:19:38.642623156 +0100
-+++ linux-2.4.35.4/drivers/net/tun.c   2007-12-15 05:20:05.056128377 +0100
-@@ -185,22 +185,31 @@
+--- 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) };
        struct sk_buff *skb;
  {
        struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };
        struct sk_buff *skb;


@@ -94,7 +90,7 @@ Index: linux-2.4.35.4/drivers/net/tun.c
  
        skb->dev = &tun->dev;
        switch (tun->flags & TUN_TYPE_MASK) {
  
        skb->dev = &tun->dev;
        switch (tun->flags & TUN_TYPE_MASK) {

-@@ -271,7 +280,8 @@
+@@ -271,7 +280,8 @@ static __inline__ ssize_t tun_put_user(s

                        pi.flags |= TUN_PKT_STRIP;
                }
   
                        pi.flags |= TUN_PKT_STRIP;
                }