mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

fix

Browse source
This commit is contained in:
suyuan 2022-11-22 14:10:17 +08:00
parent 930c4492e0
commit 064a17e169
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
root/target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch
View file

@ -98,7 +98,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
#if defined(CONFIG_NF_CONNTRACK_LABELS) #if defined(CONFIG_NF_CONNTRACK_LABELS)
--- a/net/netfilter/Kconfig --- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig
@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS @@ -135,6 +135,14 @@ config NF_CONNTRACK_EVENTS
If unsure, say `N'. If unsure, say `N'.

12
root/target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View file

@ -12,9 +12,9 @@
struct list_head *br_ip_list); struct list_head *br_ip_list);
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -826,6 +826,10 @@ struct sk_buff { @@ -827,6 +827,10 @@ struct sk_buff {
#endif #endif
__u8 gro_skip:1; __u8 scm_io_uring:1;
+#ifdef CONFIG_SHORTCUT_FE +#ifdef CONFIG_SHORTCUT_FE
+ __u8 fast_forwarded:1; + __u8 fast_forwarded:1;
@ -99,7 +99,7 @@
#ifdef CONFIG_ETHERNET_PACKET_MANGLE #ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (!dev->eth_mangle_tx || if (!dev->eth_mangle_tx ||
(skb = dev->eth_mangle_tx(dev, skb)) != NULL) (skb = dev->eth_mangle_tx(dev, skb)) != NULL)
@@ -4714,6 +4722,11 @@ void netdev_rx_handler_unregister(struct @@ -4715,6 +4723,11 @@ void netdev_rx_handler_unregister(struct
} }
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
@ -111,7 +111,7 @@
/* /*
* Limit the use of PFMEMALLOC reserves to those protocols that implement * Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs. * the special handling of PFMEMALLOC skbs.
@@ -4764,6 +4777,10 @@ static int __netif_receive_skb_core(stru @@ -4765,6 +4778,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP; int ret = NET_RX_DROP;
__be16 type; __be16 type;
@ -119,10 +119,10 @@
+ int (*fast_recv)(struct sk_buff *skb); + int (*fast_recv)(struct sk_buff *skb);
+#endif +#endif
+ +
net_timestamp_check(!netdev_tstamp_prequeue, skb); net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
trace_netif_receive_skb(skb); trace_netif_receive_skb(skb);
@@ -4803,6 +4820,16 @@ another_round: @@ -4804,6 +4821,16 @@ another_round:
goto out; goto out;
} }