diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-08 09:36:38 +0100 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-02-08 18:43:13 +0100 |
| commit | 3072908d0d946e38928e477fc6c32b952c7afc22 (patch) | |
| tree | e50a1c27e1e08c4cb6f3c66d88d66b91b40c3c70 /target/linux/generic/pending-4.14/650-pppoe_header_pad.patch | |
| parent | 787326b43e332b378899205294b1d92ea77a45d4 (diff) | |
| download | upstream-3072908d0d946e38928e477fc6c32b952c7afc22.tar.gz upstream-3072908d0d946e38928e477fc6c32b952c7afc22.tar.bz2 upstream-3072908d0d946e38928e477fc6c32b952c7afc22.zip | |
kernel: bump 4.14 to 4.14.18
Refresh patches.
Remove upstreamed patches:
- apm821xx/010-crypto-gcm-add-GCM-IV-size-constant.patch
- backport/040-crypto-fix-typo-in-KPP-dependency-of-CRYPTO_ECDH.patch
Remove pending-4.14/650-pppoe_header_pad.patch, it is superseded by
upstream commit d32e5740001972c1bb193dd60af02721d047a17e.
Update patch that no longer applies: hack/204-module_strip.patch
Compile-tested: octeon, x86/64.
Runtime-tested: octeon, x86/64.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.14/650-pppoe_header_pad.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/650-pppoe_header_pad.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/generic/pending-4.14/650-pppoe_header_pad.patch b/target/linux/generic/pending-4.14/650-pppoe_header_pad.patch deleted file mode 100644 index 3115073b50..0000000000 --- a/target/linux/generic/pending-4.14/650-pppoe_header_pad.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Felix Fietkau <nbd@nbd.name> -Subject: pppoe: add extra padding for the header (useful for drivers that need headroom) - -lede-commit 6517a757ec711fc3354b857e273e2621042f3c7a -Signed-off-by: Felix Fietkau <nbd@nbd.name> ---- - drivers/net/ppp/pppoe.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/net/ppp/pppoe.c -+++ b/drivers/net/ppp/pppoe.c -@@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket * - goto end; - - -- skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32, -+ skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD, - 0, GFP_KERNEL); - if (!skb) { - error = -ENOMEM; -@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket * - } - - /* Reserve space for headers. */ -- skb_reserve(skb, dev->hard_header_len); -+ skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD); - skb_reset_network_header(skb); - - skb->dev = dev; |