mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
a0c49ef46f
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
21 lines
590 B
Diff
21 lines
590 B
Diff
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -872,7 +872,7 @@ static int pppoe_sendmsg(struct socket *
|
|
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;
|
|
@@ -880,7 +880,7 @@ static int pppoe_sendmsg(struct socket *
|
|
}
|
|
|
|
/* 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;
|