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 | 1c45c113c4aee13ca5a5cc30f357d2072a14b5e7 (patch) | |
tree | 89a6f12673d11ed2a89ac083a6c93ce47dad831c /target/linux/generic/patches-3.18/650-pppoe_header_pad.patch | |
parent | ac7e9e859bb08a7d8a9c82bed1d08abbf57b5ace (diff) | |
download | master-187ad058-1c45c113c4aee13ca5a5cc30f357d2072a14b5e7.tar.gz master-187ad058-1c45c113c4aee13ca5a5cc30f357d2072a14b5e7.tar.bz2 master-187ad058-1c45c113c4aee13ca5a5cc30f357d2072a14b5e7.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43093 3c298f89-4303-0410-b956-a3cf2f4a3e73
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; |