diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2016-03-18 23:41:21 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-03-18 23:41:21 +0000 |
| commit | b3191abc3fe7b95cf46da8dc56603a3a04c7c461 (patch) | |
| tree | b1f3b12ce0f6f0137a6fe047ecf67f9c51547516 /target/linux/generic/patches-4.1/721-phy_packets.patch | |
| parent | 3c2adfb7634f84cdc9b92f146b7fbbf46a709cd3 (diff) | |
| download | master-187ad058-b3191abc3fe7b95cf46da8dc56603a3a04c7c461.tar.gz master-187ad058-b3191abc3fe7b95cf46da8dc56603a3a04c7c461.tar.bz2 master-187ad058-b3191abc3fe7b95cf46da8dc56603a3a04c7c461.zip | |
kernel: update kernel 4.1 to version 4.1.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49035 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/721-phy_packets.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.1/721-phy_packets.patch b/target/linux/generic/patches-4.1/721-phy_packets.patch index a511c66d2f..3a963b5d69 100644 --- a/target/linux/generic/patches-4.1/721-phy_packets.patch +++ b/target/linux/generic/patches-4.1/721-phy_packets.patch @@ -41,7 +41,7 @@ */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2058,6 +2058,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2059,6 +2059,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 -@@ -2184,16 +2188,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2185,16 +2189,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2645,10 +2645,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2650,10 +2650,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); @@ -121,7 +121,7 @@ #include <net/protocol.h> #include <net/dst.h> -@@ -568,6 +569,22 @@ struct sk_buff *__napi_alloc_skb(struct +@@ -570,6 +571,22 @@ struct sk_buff *__napi_alloc_skb(struct } EXPORT_SYMBOL(__napi_alloc_skb); |