aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/721-phy_packets.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-10-28 18:59:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-10-28 18:59:39 +0000
commit87186c5ed4681ba9830c072f4487e206147c973d (patch)
tree1c74c271734b4ac4e4eb26a761ed04c06f60f6e1 /target/linux/generic/patches-3.6/721-phy_packets.patch
parenta6549ac1cbe00295dcf8274eeba09effb5103d4a (diff)
downloadupstream-87186c5ed4681ba9830c072f4487e206147c973d.tar.gz
upstream-87186c5ed4681ba9830c072f4487e206147c973d.tar.bz2
upstream-87186c5ed4681ba9830c072f4487e206147c973d.zip
kernel: update linux 3.6 to 3.6.4
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 33982
Diffstat (limited to 'target/linux/generic/patches-3.6/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.6/721-phy_packets.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/721-phy_packets.patch b/target/linux/generic/patches-3.6/721-phy_packets.patch
index e8578de57a..3a0fdc95b3 100644
--- a/target/linux/generic/patches-3.6/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.6/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
-@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1653,6 +1653,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
-@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1755,16 +1759,6 @@ static inline struct sk_buff *dev_alloc_
}