aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-02-23 22:59:53 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-02-23 22:59:53 +0000
commit8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405 (patch)
tree5039fd0ff8cfb7e66fbbc575c9cf8dacf62eeb17 /target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
parentd3d69d8a8cee37835d99487e65bb5156ef916dc5 (diff)
downloadmaster-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.tar.gz
master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.tar.bz2
master-187ad058-8f979de5a1b78dc4a4a0eb31b6ee33a46cd05405.zip
generic: early (incomplete!) 4.0 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-4.0/650-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch b/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
new file mode 100644
index 0000000000..a89a9f3b74
--- /dev/null
+++ b/target/linux/generic/patches-4.0/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;