From 7db05f73b182f515e9091ad93f6ad1ca9477e2ad Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Mon, 12 Sep 2022 00:12:25 +0800 Subject: [PATCH] fix --- patches/Kconfig.patch | 12 ------- patches/Makefile.patch | 10 ------ patches/dev.c.patch | 43 -------------------------- patches/nf_conntrack_proto_tcp.c.patch | 25 --------------- 4 files changed, 90 deletions(-) delete mode 100644 patches/Kconfig.patch delete mode 100644 patches/Makefile.patch delete mode 100644 patches/dev.c.patch delete mode 100644 patches/nf_conntrack_proto_tcp.c.patch diff --git a/patches/Kconfig.patch b/patches/Kconfig.patch deleted file mode 100644 index 7df0abe83..000000000 --- a/patches/Kconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/net/Kconfig b/net/Kconfig -index 976cb63..4a7b0af 100644 ---- a/net/Kconfig -+++ b/net/Kconfig -@@ -236,6 +236,7 @@ source "net/dcb/Kconfig" - source "net/dns_resolver/Kconfig" - source "net/batman-adv/Kconfig" - source "net/openvswitch/Kconfig" -+source "net/shortcut-fe/Kconfig" - - config RPS - boolean "RPS" diff --git a/patches/Makefile.patch b/patches/Makefile.patch deleted file mode 100644 index 1ccc2b0ec..000000000 --- a/patches/Makefile.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/net/Makefile b/net/Makefile -index 6865dab..a8f0091 100644 ---- a/net/Makefile -+++ b/net/Makefile -@@ -71,3 +71,5 @@ obj-$(CONFIG_BATMAN_ADV) += batman-adv/ - obj-$(CONFIG_NFC) += nfc/ - obj-$(CONFIG_OPENVSWITCH) += openvswitch/ - obj-$(CONFIG_NET_ACTIVITY_STATS) += activity_stats.o -+obj-$(CONFIG_SHORTCUT_FE) += shortcut-fe/ -+ diff --git a/patches/dev.c.patch b/patches/dev.c.patch deleted file mode 100644 index 55fc03a74..000000000 --- a/patches/dev.c.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/net/core/dev.c b/net/core/dev.c -index d23742f..1f0415f 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -3168,6 +3168,9 @@ void netdev_rx_handler_unregister(struct net_device *dev) - } - EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); - -+int (*athrs_fast_nat_recv)(struct sk_buff *skb) __rcu __read_mostly; -+EXPORT_SYMBOL_GPL(athrs_fast_nat_recv); -+ - static int __netif_receive_skb(struct sk_buff *skb) - { - struct packet_type *ptype, *pt_prev; -@@ -3177,6 +3180,7 @@ static int __netif_receive_skb(struct sk_buff *skb) - bool deliver_exact = false; - int ret = NET_RX_DROP; - __be16 type; -+ int (*fast_recv)(struct sk_buff *skb); - - net_timestamp_check(!netdev_tstamp_prequeue, skb); - -@@ -3194,10 +3198,18 @@ static int __netif_receive_skb(struct sk_buff *skb) - skb_reset_transport_header(skb); - skb_reset_mac_len(skb); - -- pt_prev = NULL; -- - rcu_read_lock(); - -+ fast_recv = rcu_dereference(athrs_fast_nat_recv); -+ if (fast_recv) { -+ if (fast_recv(skb)) { -+ rcu_read_unlock(); -+ return NET_RX_SUCCESS; -+ } -+ } -+ -+ pt_prev = NULL; -+ - another_round: - - __this_cpu_inc(softnet_data.processed); diff --git a/patches/nf_conntrack_proto_tcp.c.patch b/patches/nf_conntrack_proto_tcp.c.patch deleted file mode 100644 index 2cd2313a2..000000000 --- a/patches/nf_conntrack_proto_tcp.c.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- /home/dhudson/mips-orig/nf_conntrack_proto_tcp.c 2013-05-07 21:32:57.153896922 +0100 -+++ nf_conntrack_proto_tcp.c 2013-06-13 16:37:40.137102438 +0100 -@@ -27,18 +27,20 @@ - #include - #include - #include - #include - - /* Do not check the TCP window for incoming packets */ --static int nf_ct_tcp_no_window_check __read_mostly = 1; -+int nf_ct_tcp_no_window_check __read_mostly = 0; -+EXPORT_SYMBOL_GPL(nf_ct_tcp_no_window_check); - - /* "Be conservative in what you do, - be liberal in what you accept from others." - If it's non-zero, we mark only out of window RST segments as INVALID. */ --static int nf_ct_tcp_be_liberal __read_mostly = 0; -+int nf_ct_tcp_be_liberal __read_mostly = 0; -+EXPORT_SYMBOL_GPL(nf_ct_tcp_be_liberal); - - /* If it is set to zero, we disable picking up already established - connections. */ - static int nf_ct_tcp_loose __read_mostly = 1; - - /* Max number of the retransmitted packets without receiving an (acceptable)