summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-15 21:31:01 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-15 21:31:01 +0000
commited6be451a0906c1d99e8726307f73a7997b8e70c (patch)
treeddcbfa29bdb1ce96cc700e7ed428a098053ecf8f /target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
parentaaffd9709f6d001dae9ba9dbbe88ceb6cfd961de (diff)
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27191 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-3.0/650-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
new file mode 100644
index 000000000..4875d5f23
--- /dev/null
+++ b/target/linux/generic/patches-3.0/650-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/pppoe.c
++++ b/drivers/net/pppoe.c
+@@ -855,7 +855,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;
+@@ -863,7 +863,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;