aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-16 18:31:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-16 18:31:05 +0000
commit3fa43f54a267f45e42be641945573450a0a419b8 (patch)
treeafa65eace467c96d7b49262ac89892f8d8f977b6 /target/linux/generic/patches-2.6.39/650-pppoe_header_pad.patch
parent71d8c66250eef1806d680a27d175c61dd9971a5e (diff)
downloadupstream-3fa43f54a267f45e42be641945573450a0a419b8.tar.gz
upstream-3fa43f54a267f45e42be641945573450a0a419b8.tar.bz2
upstream-3fa43f54a267f45e42be641945573450a0a419b8.zip
kernel: reorganize 2.6.39 patches
SVN-Revision: 26691
Diffstat (limited to 'target/linux/generic/patches-2.6.39/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/650-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/650-pppoe_header_pad.patch b/target/linux/generic/patches-2.6.39/650-pppoe_header_pad.patch
new file mode 100644
index 0000000000..4875d5f23f
--- /dev/null
+++ b/target/linux/generic/patches-2.6.39/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;