diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-06-29 21:54:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-06-29 21:54:11 +0000 |
| commit | f3c0929d37057113bfd21480606b31c679b6c93a (patch) | |
| tree | dbe3dbcb060df30bedf820383400202d7c2b331f | |
| parent | 66eee3b1a21ecef79db9506d71c786c1990a2f7d (diff) | |
| download | upstream-f3c0929d37057113bfd21480606b31c679b6c93a.tar.gz upstream-f3c0929d37057113bfd21480606b31c679b6c93a.tar.bz2 upstream-f3c0929d37057113bfd21480606b31c679b6c93a.zip | |
pppoe: add extra padding for the header (useful for drivers that need headroom)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16628 3c298f89-4303-0410-b956-a3cf2f4a3e73
3 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.28/250-pppoe_header_pad.patch new file mode 100644 index 0000000000..87e5099927 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.28/250-pppoe_header_pad.patch @@ -0,0 +1,20 @@ +--- a/drivers/net/pppoe.c ++++ b/drivers/net/pppoe.c +@@ -812,7 +812,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; +@@ -820,7 +820,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; diff --git a/target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.29/250-pppoe_header_pad.patch new file mode 100644 index 0000000000..042546f317 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.29/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; diff --git a/target/linux/generic-2.6/patches-2.6.30/250-pppoe_header_pad.patch b/target/linux/generic-2.6/patches-2.6.30/250-pppoe_header_pad.patch new file mode 100644 index 0000000000..042546f317 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/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; |