[kernel/2.6.37] refresh patches

[openwrt.git] / target / linux / generic / patches-2.6.30 / 205-skb_padding.patch

diff --git a/target/linux/generic/patches-2.6.30/205-skb_padding.patch b/target/linux/generic/patches-2.6.30/205-skb_padding.patch
index 06b494b..cc35dcf 100644 (file)
--- a/target/linux/generic/patches-2.6.30/205-skb_padding.patch
+++ b/target/linux/generic/patches-2.6.30/205-skb_padding.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h

-@@ -1369,11 +1369,18 @@ static inline int skb_network_offset(con
+@@ -1351,11 +1351,18 @@ static inline int skb_network_offset(con

   *
   * Various parts of the networking layer expect at least 32 bytes of
   * headroom, you should not reduce this.
   *
   * Various parts of the networking layer expect at least 32 bytes of
   * headroom, you should not reduce this.


@@ -19,7 +19,7 @@
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)

-@@ -1463,9 +1470,9 @@ static inline void __skb_queue_purge(str
+@@ -1445,9 +1452,9 @@ static inline void __skb_queue_purge(str

  static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
                                              gfp_t gfp_mask)
  {
  static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
                                              gfp_t gfp_mask)
  {


@@ -31,7 +31,7 @@
        return skb;
  }
  
        return skb;
  }
  

-@@ -1538,7 +1545,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1520,7 +1527,7 @@ static inline int __skb_cow(struct sk_bu

                delta = headroom - skb_headroom(skb);
  
        if (delta || cloned)
                delta = headroom - skb_headroom(skb);
  
        if (delta || cloned)


@@ -42,7 +42,7 @@
  }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
  }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c

-@@ -327,9 +327,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -250,9 +250,9 @@ struct sk_buff *__netdev_alloc_skb(struc

        int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
        struct sk_buff *skb;
  
        int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
        struct sk_buff *skb;