diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-27 18:14:39 +0000 |
| commit | 1513b39a8c8e21e3f8fbebab9fb4c41040ccf695 (patch) | |
| tree | 7c786effff410b4a96d29c920d60cd279236fbf7 /target/linux/generic/patches-3.18/650-pppoe_header_pad.patch | |
| parent | 38e72c779e229933625d96d4355a0250123b6ce5 (diff) | |
| download | upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.gz upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.tar.bz2 upstream-1513b39a8c8e21e3f8fbebab9fb4c41040ccf695.zip | |
kernel: start working on 3.18 support
This commit:
1) Copies 3.14 patches
2) Drops mainlined stuff
3) Modifies some patches to apply
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43093
Diffstat (limited to 'target/linux/generic/patches-3.18/650-pppoe_header_pad.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/650-pppoe_header_pad.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch new file mode 100644 index 0000000000..a89a9f3b74 --- /dev/null +++ b/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch @@ -0,0 +1,20 @@ +--- a/drivers/net/ppp/pppoe.c ++++ b/drivers/net/ppp/pppoe.c +@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i + 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; +@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i + } + + /* 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; |