mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: pppoe: add extra padding for the header (useful for drivers that need headroom)
|
|
|
|
lede-commit 6517a757ec711fc3354b857e273e2621042f3c7a
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
drivers/net/ppp/pppoe.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
|
|
index 4ddae8118c85..49ef11f92fc9 100644
|
|
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
|
|
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;
|
|
@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
|
|
}
|
|
|
|
/* 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;
|
|
--
|
|
2.11.0
|
|
|