diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-03-02 08:31:03 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 12:58:56 +0100 |
| commit | e72b2464b15f4a8dbe2d443a57ff7aa761990da8 (patch) | |
| tree | e78268dfec1c0634fcc363932b9d2477cf0372cc /target/linux/generic/pending-4.4/650-pppoe_header_pad.patch | |
| parent | 5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5 (diff) | |
| download | upstream-e72b2464b15f4a8dbe2d443a57ff7aa761990da8.tar.gz upstream-e72b2464b15f4a8dbe2d443a57ff7aa761990da8.tar.bz2 upstream-e72b2464b15f4a8dbe2d443a57ff7aa761990da8.zip | |
kernel: bump 4.4 to 4.4.119
This bumps the 4.4. kernel in master to 4.4.119.
Includes more Meltdown & Spectre mitigation.
* Refresh patches.
* Refresh x86/config for RETPOLINE.
* Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream)
* Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream)
* Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was replaced)).
Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant.
Compile-tested on: ar71xx & oxnas.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Tested-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-4.4/650-pppoe_header_pad.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/650-pppoe_header_pad.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/target/linux/generic/pending-4.4/650-pppoe_header_pad.patch b/target/linux/generic/pending-4.4/650-pppoe_header_pad.patch deleted file mode 100644 index 409de58c28..0000000000 --- a/target/linux/generic/pending-4.4/650-pppoe_header_pad.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/net/ppp/pppoe.c -+++ b/drivers/net/ppp/pppoe.c -@@ -879,7 +879,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; -@@ -887,7 +887,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; |