diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-02-28 22:53:37 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-02 21:33:08 +0100 |
| commit | b5469b38cd68342db0a4c476aec9ad7a0c164027 (patch) | |
| tree | 62fe543196f822f4d396c335aa6ca4b5c590c187 /target/linux/generic/hack-4.14/721-phy_packets.patch | |
| parent | 844bdf94e42e967e35b71212cb9261fcb35e6aae (diff) | |
| download | upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.tar.gz upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.tar.bz2 upstream-b5469b38cd68342db0a4c476aec9ad7a0c164027.zip | |
kernel: bump 4.14 to 4.14.23
This patch bumps the 4.14 kernel to .23.
- Refreshed patches.
- Deleted bcm53xx/patches-4.14/089-PCI-iproc-Fix-NULL-pointer-dereference-for-BCMA.patch. Has been accepted upstream.
- Deleted generic/pending-4.14/821-usb-Remove-annoying-warning-about-bogus-URB.patch. The upstream URB code was changed,
the patch no longer applies. I discussed this with the patch author and removed it for now, we'll see how it goes.
Compile-tested on: ramips/mt7621, x86/64
Run-tested on: ramips/mt7621, x86/64
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/hack-4.14/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/hack-4.14/721-phy_packets.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index 07e6e9da6d..e3af0a07a3 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2494,6 +2494,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2491,6 +2491,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2624,16 +2628,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2621,16 +2625,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -128,7 +128,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -64,6 +64,7 @@ +@@ -63,6 +63,7 @@ #include <linux/errqueue.h> #include <linux/prefetch.h> #include <linux/if_vlan.h> @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/protocol.h> #include <net/dst.h> -@@ -503,6 +504,22 @@ skb_fail: +@@ -499,6 +500,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); |