1513b39a8c
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
21 lines
590 B
Diff
21 lines
590 B
Diff
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -850,7 +850,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;
|
|
@@ -858,7 +858,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;
|