aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/721-phy_packets.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-11-10 22:51:30 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-11-10 22:51:30 +0000
commitc0fd27ae720f08b264115b8cfbce414662a96c89 (patch)
tree1d88b4adbd31efda3ca82dd3a8ed689bc08661f8 /target/linux/generic/patches-3.18/721-phy_packets.patch
parentb59385e75e3136af064941364b341b8658397960 (diff)
downloadmaster-187ad058-c0fd27ae720f08b264115b8cfbce414662a96c89.tar.gz
master-187ad058-c0fd27ae720f08b264115b8cfbce414662a96c89.tar.bz2
master-187ad058-c0fd27ae720f08b264115b8cfbce414662a96c89.zip
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43229 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/721-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-3.18/721-phy_packets.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/721-phy_packets.patch b/target/linux/generic/patches-3.18/721-phy_packets.patch
index 779ab4d0f2..0e21ff3080 100644
--- a/target/linux/generic/patches-3.18/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.18/721-phy_packets.patch
@@ -41,7 +41,7 @@
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2044,6 +2044,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2052,6 +2052,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@ -52,7 +52,7 @@
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -2170,16 +2174,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2178,16 +2182,6 @@ static inline struct sk_buff *dev_alloc_
}