target/linux/generic/pending-4.9/650-pppoe_header_pad.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Subject: pppoe: add extra padding for the header (useful for drivers that need headroom)
   3
   4 lede-commit 6517a757ec711fc3354b857e273e2621042f3c7a
   5 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   6 ---
   7  drivers/net/ppp/pppoe.c | 4 ++--
   8  1 file changed, 2 insertions(+), 2 deletions(-)
   9
  10 diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
  11 index 4ddae8118c85..49ef11f92fc9 100644
  12 --- a/drivers/net/ppp/pppoe.c
  13 +++ b/drivers/net/ppp/pppoe.c
  14 @@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
  15                 goto end;
  16
  17
  18 -       skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
  19 +       skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
  20                            0, GFP_KERNEL);
  21         if (!skb) {
  22                 error = -ENOMEM;
  23 @@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
  24         }
  25
  26         /* Reserve space for headers. */
  27 -       skb_reserve(skb, dev->hard_header_len);
  28 +       skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
  29         skb_reset_network_header(skb);
  30
  31         skb->dev = dev;
  32 --
  33 2.11.0
  34