mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-14 20:02:04 +08:00
6fc2d00f25
Manually rebased: generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch octeon/patches-5.4/700-allocate_interface_by_label.patch All other patches automatically rebased. Signed-off-by: Liu Linhui <liulinhui36@gmail.com> Signed-off-by: Liu Linhui <liulinhui36@gmail.com>
21 lines
611 B
Diff
21 lines
611 B
Diff
--- a/net/core/skbuff.c
|
|
+++ b/net/core/skbuff.c
|
|
@@ -69,6 +69,7 @@
|
|
#include <net/ip6_checksum.h>
|
|
#include <net/xfrm.h>
|
|
#include <net/mpls.h>
|
|
+#include <net/ra_nat.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
#include <trace/events/skb.h>
|
|
@@ -1666,6 +1667,9 @@ int pskb_expand_head(struct sk_buff *skb
|
|
skb_shinfo(skb),
|
|
offsetof(struct skb_shared_info, frags[skb_shinfo(skb)->nr_frags]));
|
|
|
|
+ /*headroom copy*/
|
|
+ memcpy(data, skb->head, FOE_INFO_LEN);
|
|
+
|
|
/*
|
|
* if shinfo is shared we must drop the old head gracefully, but if it
|
|
* is not we can just drop the old head and let the existing refcount
|