aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorMatteo Croce <matteo@openwrt.org>2010-02-28 15:20:00 +0000
committerMatteo Croce <matteo@openwrt.org>2010-02-28 15:20:00 +0000
commit7cce85a44a0cdf826c5f1850c0465e51c6b346a2 (patch)
treec49ac1a86a7262dd17d7b4c0af3c151c37338619 /target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
parent4c71989564cb66bffc1cd9f075f0c776282b61e4 (diff)
downloadupstream-7cce85a44a0cdf826c5f1850c0465e51c6b346a2.tar.gz
upstream-7cce85a44a0cdf826c5f1850c0465e51c6b346a2.tar.bz2
upstream-7cce85a44a0cdf826c5f1850c0465e51c6b346a2.zip
kernel: add 2.6.33 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19905 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
new file mode 100644
index 0000000000..a2535db60e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.33/250-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/pppoe.c
++++ b/drivers/net/pppoe.c
+@@ -862,7 +862,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;
+@@ -870,7 +870,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;