diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-04 11:34:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-04 11:34:39 +0000 |
commit | 94fab5804b6f68cf2c606b57866c2cb12306cbf2 (patch) | |
tree | 643feda132ba5907f45408bc191b4501a4918284 /target/linux/generic/patches-4.1/721-phy_packets.patch | |
parent | 145a1573469c39ebeaedeab2a3df09dea5db85fc (diff) | |
download | master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.gz master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.tar.bz2 master-187ad058-94fab5804b6f68cf2c606b57866c2cb12306cbf2.zip |
kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10
096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.
Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47104 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 | 6 |
1 files changed, 3 insertions, 3 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 4855186b9f..a511c66d2f 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 -@@ -2062,6 +2062,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2058,6 +2058,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 -@@ -2188,16 +2192,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2184,16 +2188,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -86,7 +86,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2649,10 +2649,20 @@ static int xmit_one(struct sk_buff *skb, +@@ -2645,10 +2645,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); |