[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
[openwrt.git] / target / linux / generic / patches-3.7 / 650-pppoe_header_pad.patch
1 --- a/drivers/net/ppp/pppoe.c
2 +++ b/drivers/net/ppp/pppoe.c
3 @@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
4                 goto end;
5  
6  
7 -       skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
8 +       skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
9                            0, GFP_KERNEL);
10         if (!skb) {
11                 error = -ENOMEM;
12 @@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
13         }
14  
15         /* Reserve space for headers. */
16 -       skb_reserve(skb, dev->hard_header_len);
17 +       skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
18         skb_reset_network_header(skb);
19  
20         skb->dev = dev;