diff options
Diffstat (limited to 'target/linux/generic/hack-4.19/901-debloat_sock_diag.patch')
| -rw-r--r-- | target/linux/generic/hack-4.19/901-debloat_sock_diag.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch index d250843a6a..e949964cbf 100644 --- a/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/Kconfig +++ b/net/Kconfig -@@ -97,6 +97,9 @@ source "net/netlabel/Kconfig" +@@ -98,6 +98,9 @@ source "net/netlabel/Kconfig" endif # if INET @@ -34,15 +34,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ - sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \ + dev_ioctl.o tso.o sock_reuseport.o \ - fib_notifier.o + fib_notifier.o xdp.o -+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o ++obj-$(CONFIG_SOCK_DIAG) += sock_diag.o obj-y += net-sysfs.o + obj-$(CONFIG_PAGE_POOL) += page_pool.o obj-$(CONFIG_PROC_FS) += net-procfs.o - obj-$(CONFIG_NET_PKTGEN) += pktgen.o --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -528,6 +528,18 @@ discard_and_relse: +@@ -490,6 +490,18 @@ discard_and_relse: } EXPORT_SYMBOL(__sk_receive_skb); @@ -61,10 +61,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) { struct dst_entry *dst = __sk_dst_get(sk); -@@ -1595,9 +1607,11 @@ void sk_destruct(struct sock *sk) +@@ -1600,9 +1612,11 @@ static void __sk_free(struct sock *sk) + if (likely(sk->sk_net_refcnt)) + sock_inuse_add(sock_net(sk), -1); - static void __sk_free(struct sock *sk) - { +#ifdef CONFIG_SOCK_DIAG if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk))) sock_diag_broadcast_destroy(sk); @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/core/sock_diag.c +++ b/net/core/sock_diag.c -@@ -19,18 +19,6 @@ static int (*inet_rcv_compat)(struct sk_ +@@ -20,18 +20,6 @@ static int (*inet_rcv_compat)(struct sk_ static DEFINE_MUTEX(sock_diag_table_mutex); static struct workqueue_struct *broadcast_wq; @@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> u64 res; --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig -@@ -420,6 +420,7 @@ config INET_XFRM_MODE_BEET +@@ -425,6 +425,7 @@ config INET_XFRM_MODE_BEET config INET_DIAG tristate "INET: socket monitoring interface" |