summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
diff options
context:
space:
mode:
authormirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-22 12:46:12 +0000
committermirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-22 12:46:12 +0000
commitc3fd35e7800ae1f2dd3fa42ade850c948e4b18ea (patch)
treef2e9f1150816b597adc38a4ca8a7a5f14a0909e5 /target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
parentf48e79cafe9d99bc741c905cb8328cc54cb75f6d (diff)
add generic patchset levelled up to 2.6.31-rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17351 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
new file mode 100644
index 000000000..042546f31
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.31/250-pppoe_header_pad.patch
@@ -0,0 +1,20 @@
+--- a/drivers/net/pppoe.c
++++ b/drivers/net/pppoe.c
+@@ -863,7 +863,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;
+@@ -871,7 +871,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;