aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-08-29 14:35:23 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-08-29 14:35:23 +0000
commit93d46eff0251eed425d040eb57ab884881cc7bbf (patch)
treef0db464d80e07fbb18c9f99ac73f45aadf7e22a6 /target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch
parent324a2cedd382a542391a01b2092686b0befbbf6a (diff)
downloadupstream-93d46eff0251eed425d040eb57ab884881cc7bbf.tar.gz
upstream-93d46eff0251eed425d040eb57ab884881cc7bbf.tar.bz2
upstream-93d46eff0251eed425d040eb57ab884881cc7bbf.zip
linux/generic: add kernel 2.6.36 preliminary support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22832 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch b/target/linux/generic/patches-2.6.36/250-pppoe_header_pad.patch
new file mode 100644
index 0000000000..147b28366a
--- /dev/null
+++ b/target/linux/generic/patches-2.6.36/250-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;