aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/721-phy_packets.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-12-15 19:16:30 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-12-15 19:16:30 +0000
commit361080737b7d4b151690a77a8850659a6450eef0 (patch)
treebecf2130c8eb62a21b5c049624b222ad234cae29 /target/linux/generic/patches-3.10/721-phy_packets.patch
parent306d96500aaf7a3a153f5b0629fa5d3cff268b33 (diff)
downloadmaster-187ad058-361080737b7d4b151690a77a8850659a6450eef0.tar.gz
master-187ad058-361080737b7d4b151690a77a8850659a6450eef0.tar.bz2
master-187ad058-361080737b7d4b151690a77a8850659a6450eef0.zip
kernel: update kernel 3.10 to 3.10.24
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39059 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.10/721-phy_packets.patch4
1 files changed, 2 insertions, 2 deletions
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 f678ef42e2..7d51ae70ff 100644
--- 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
-@@ -1883,6 +1883,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1874,6 +1874,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
-@@ -2007,16 +2011,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1998,16 +2002,6 @@ static inline struct sk_buff *dev_alloc_
}