aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
committerJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
commitf8c7d2d540cb3ef04ea077a54ab40032f2a50976 (patch)
treecc4ae0400759c09d1eb08510f89711899bf63bce /target/linux/generic/patches-3.1/650-pppoe_header_pad.patch
parentc025c5e99da524b1bb8fc9bdf00836f4e7402d96 (diff)
downloadupstream-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.tar.gz
upstream-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.tar.bz2
upstream-f8c7d2d540cb3ef04ea077a54ab40032f2a50976.zip
linux: generic: add support for 3.1-rc1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27940 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-3.1/650-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.1/650-pppoe_header_pad.patch
new file mode 100644
index 0000000000..147b28366a
--- /dev/null
+++ b/target/linux/generic/patches-3.1/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/pppoe.c
++++ b/drivers/net/pppoe.c
+@@ -856,7 +856,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;
+@@ -864,7 +864,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;