kernel: update 3.10 to 3.10.18

[openwrt.git] / target / linux / generic / patches-3.10 / 721-phy_packets.patch

diff --git a/target/linux/generic/patches-3.10/721-phy_packets.patch b/target/linux/generic/patches-3.10/721-phy_packets.patch
index 8692007..f678ef4 100644 (file)
--- a/target/linux/generic/patches-3.10/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.10/721-phy_packets.patch
@@ -34,7 +34,7 @@
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1878,6 +1878,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1883,6 +1883,10 @@ static inline int pskb_trim(struct sk_bu
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -45,7 +45,7 @@
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
-@@ -2002,16 +2006,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2007,16 +2011,6 @@ static inline struct sk_buff *dev_alloc_
  }