aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/721-phy_packets.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-02-13 12:57:36 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-02-13 12:57:36 +0000
commit83d9cec4911b6639c1c2f22cfb943df3e1252a1e (patch)
treebbe1dc425b45488b12a00269dfde5875cee98a69 /target/linux/generic/patches-3.12/721-phy_packets.patch
parent4c1dabb81e4b2d9299aa535b3df198c483285777 (diff)
downloadupstream-83d9cec4911b6639c1c2f22cfb943df3e1252a1e.tar.gz
upstream-83d9cec4911b6639c1c2f22cfb943df3e1252a1e.tar.bz2
upstream-83d9cec4911b6639c1c2f22cfb943df3e1252a1e.zip
upgrade 3.12 to 3.12.10
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 39581
Diffstat (limited to 'target/linux/generic/patches-3.12/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.12/721-phy_packets.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.12/721-phy_packets.patch b/target/linux/generic/patches-3.12/721-phy_packets.patch
index 9363ad125e..47649195d5 100644
--- a/target/linux/generic/patches-3.12/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.12/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
-@@ -1771,6 +1771,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1776,6 +1776,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
-@@ -1898,16 +1902,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1903,16 +1907,6 @@ static inline struct sk_buff *dev_alloc_
}