From fdc0cb998931e68f6d242e1382fefe4b6b5f59ca Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 28 Dec 2020 18:25:04 -0500 Subject: [PATCH] Drop net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch Signed-off-by: Sasha Levin --- ...te-net.ipv4.conf.all.proxy_arp_pvlan.patch | 38 ------------------- queue-4.14/series | 1 - ...te-net.ipv4.conf.all.proxy_arp_pvlan.patch | 38 ------------------- queue-4.19/series | 1 - ...te-net.ipv4.conf.all.proxy_arp_pvlan.patch | 38 ------------------- queue-4.4/series | 1 - ...te-net.ipv4.conf.all.proxy_arp_pvlan.patch | 38 ------------------- queue-4.9/series | 1 - ...te-net.ipv4.conf.all.proxy_arp_pvlan.patch | 38 ------------------- queue-5.10/series | 1 - ...te-net.ipv4.conf.all.proxy_arp_pvlan.patch | 38 ------------------- queue-5.4/series | 1 - 12 files changed, 234 deletions(-) delete mode 100644 queue-4.14/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch delete mode 100644 queue-4.19/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch delete mode 100644 queue-4.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch delete mode 100644 queue-4.9/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch delete mode 100644 queue-5.10/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch delete mode 100644 queue-5.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch diff --git a/queue-4.14/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch b/queue-4.14/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch deleted file mode 100644 index bf989b9e11d..00000000000 --- a/queue-4.14/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4eaf4e9deb7a1b909df26b1af68119d685bfd6ed Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 7 Nov 2020 20:35:14 +0100 -Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan - -From: Vincent Bernat - -[ Upstream commit 1af5318c00a8acc33a90537af49b3f23f72a2c4b ] - -Introduced in 65324144b50b, the "proxy_arp_vlan" sysctl is a -per-interface sysctl to tune proxy ARP support for private VLANs. -While the "all" variant is exposed, it was a noop and never evaluated. -We use the usual "or" logic for this kind of sysctls. - -Fixes: 65324144b50b ("net: RFC3069, private VLAN proxy arp support") -Signed-off-by: Vincent Bernat -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - include/linux/inetdevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index ff876bf66cf25..52e1230cfe1b4 100644 ---- a/include/linux/inetdevice.h -+++ b/include/linux/inetdevice.h -@@ -102,7 +102,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) - - #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) - #define IN_DEV_PROXY_ARP(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP) --#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_CONF_GET(in_dev, PROXY_ARP_PVLAN) -+#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP_PVLAN) - #define IN_DEV_SHARED_MEDIA(in_dev) IN_DEV_ORCONF((in_dev), SHARED_MEDIA) - #define IN_DEV_TX_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), SEND_REDIRECTS) - #define IN_DEV_SEC_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), \ --- -2.27.0 - diff --git a/queue-4.14/series b/queue-4.14/series index 4ab5fcc5687..18a440e6c83 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -85,7 +85,6 @@ spi-tegra114-fix-reference-leak-in-tegra-spi-ops.patch mwifiex-fix-mwifiex_shutdown_sw-causing-sw-reset-fai.patch asoc-wm8998-fix-pm-disable-depth-imbalance-on-error.patch net-evaluate-net.ipvx.conf.all.ignore_routes_with_li.patch -net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch asoc-arizona-fix-a-wrong-free-in-wm8997_probe.patch rdma-mthca-work-around-wenum-conversion-warning.patch mips-bcm47xx-fix-kconfig-dependency-bug-for-bcm47xx_.patch diff --git a/queue-4.19/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch b/queue-4.19/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch deleted file mode 100644 index f16a545e654..00000000000 --- a/queue-4.19/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e1f6b1e1ec895e9de15cb3891d5a804b41ed1974 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 7 Nov 2020 20:35:14 +0100 -Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan - -From: Vincent Bernat - -[ Upstream commit 1af5318c00a8acc33a90537af49b3f23f72a2c4b ] - -Introduced in 65324144b50b, the "proxy_arp_vlan" sysctl is a -per-interface sysctl to tune proxy ARP support for private VLANs. -While the "all" variant is exposed, it was a noop and never evaluated. -We use the usual "or" logic for this kind of sysctls. - -Fixes: 65324144b50b ("net: RFC3069, private VLAN proxy arp support") -Signed-off-by: Vincent Bernat -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - include/linux/inetdevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index 11adf828edf58..141abec5cf957 100644 ---- a/include/linux/inetdevice.h -+++ b/include/linux/inetdevice.h -@@ -105,7 +105,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) - - #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) - #define IN_DEV_PROXY_ARP(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP) --#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_CONF_GET(in_dev, PROXY_ARP_PVLAN) -+#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP_PVLAN) - #define IN_DEV_SHARED_MEDIA(in_dev) IN_DEV_ORCONF((in_dev), SHARED_MEDIA) - #define IN_DEV_TX_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), SEND_REDIRECTS) - #define IN_DEV_SEC_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), \ --- -2.27.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 0d68cbac9b6..8141e1fc00c 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -130,7 +130,6 @@ spi-bcm63xx-hsspi-fix-missing-clk_disable_unprepare-.patch mwifiex-fix-mwifiex_shutdown_sw-causing-sw-reset-fai.patch asoc-wm8998-fix-pm-disable-depth-imbalance-on-error.patch net-evaluate-net.ipvx.conf.all.ignore_routes_with_li.patch -net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch asoc-arizona-fix-a-wrong-free-in-wm8997_probe.patch rdma-mthca-work-around-wenum-conversion-warning.patch mips-bcm47xx-fix-kconfig-dependency-bug-for-bcm47xx_.patch diff --git a/queue-4.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch b/queue-4.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch deleted file mode 100644 index 3226869b92c..00000000000 --- a/queue-4.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 81455cd6580cc87cc71d330115bdd67fe16dec22 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 7 Nov 2020 20:35:14 +0100 -Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan - -From: Vincent Bernat - -[ Upstream commit 1af5318c00a8acc33a90537af49b3f23f72a2c4b ] - -Introduced in 65324144b50b, the "proxy_arp_vlan" sysctl is a -per-interface sysctl to tune proxy ARP support for private VLANs. -While the "all" variant is exposed, it was a noop and never evaluated. -We use the usual "or" logic for this kind of sysctls. - -Fixes: 65324144b50b ("net: RFC3069, private VLAN proxy arp support") -Signed-off-by: Vincent Bernat -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - include/linux/inetdevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index 0e6cd645f67f3..65e88c62db7b2 100644 ---- a/include/linux/inetdevice.h -+++ b/include/linux/inetdevice.h -@@ -100,7 +100,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) - - #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) - #define IN_DEV_PROXY_ARP(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP) --#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_CONF_GET(in_dev, PROXY_ARP_PVLAN) -+#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP_PVLAN) - #define IN_DEV_SHARED_MEDIA(in_dev) IN_DEV_ORCONF((in_dev), SHARED_MEDIA) - #define IN_DEV_TX_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), SEND_REDIRECTS) - #define IN_DEV_SEC_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), \ --- -2.27.0 - diff --git a/queue-4.4/series b/queue-4.4/series index 7f984696b37..14d32c64660 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -40,7 +40,6 @@ spi-tegra20-slink-fix-reference-leak-in-slink-ops-of.patch spi-tegra20-sflash-fix-reference-leak-in-tegra_sflas.patch spi-tegra114-fix-reference-leak-in-tegra-spi-ops.patch net-evaluate-net.ipvx.conf.all.ignore_routes_with_li.patch -net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch rdma-mthca-work-around-wenum-conversion-warning.patch mips-bcm47xx-fix-kconfig-dependency-bug-for-bcm47xx_.patch media-solo6x10-fix-missing-snd_card_free-in-error-ha.patch diff --git a/queue-4.9/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch b/queue-4.9/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch deleted file mode 100644 index 491fc17d0d8..00000000000 --- a/queue-4.9/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 07d1ca76a13c0b3824639e5a4f6b979f242d592d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 7 Nov 2020 20:35:14 +0100 -Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan - -From: Vincent Bernat - -[ Upstream commit 1af5318c00a8acc33a90537af49b3f23f72a2c4b ] - -Introduced in 65324144b50b, the "proxy_arp_vlan" sysctl is a -per-interface sysctl to tune proxy ARP support for private VLANs. -While the "all" variant is exposed, it was a noop and never evaluated. -We use the usual "or" logic for this kind of sysctls. - -Fixes: 65324144b50b ("net: RFC3069, private VLAN proxy arp support") -Signed-off-by: Vincent Bernat -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - include/linux/inetdevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index 0e6cd645f67f3..65e88c62db7b2 100644 ---- a/include/linux/inetdevice.h -+++ b/include/linux/inetdevice.h -@@ -100,7 +100,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) - - #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) - #define IN_DEV_PROXY_ARP(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP) --#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_CONF_GET(in_dev, PROXY_ARP_PVLAN) -+#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP_PVLAN) - #define IN_DEV_SHARED_MEDIA(in_dev) IN_DEV_ORCONF((in_dev), SHARED_MEDIA) - #define IN_DEV_TX_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), SEND_REDIRECTS) - #define IN_DEV_SEC_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), \ --- -2.27.0 - diff --git a/queue-4.9/series b/queue-4.9/series index 129142f1afa..d0ba6d16ed5 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -60,7 +60,6 @@ spi-tegra20-slink-fix-reference-leak-in-slink-ops-of.patch spi-tegra20-sflash-fix-reference-leak-in-tegra_sflas.patch spi-tegra114-fix-reference-leak-in-tegra-spi-ops.patch net-evaluate-net.ipvx.conf.all.ignore_routes_with_li.patch -net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch rdma-mthca-work-around-wenum-conversion-warning.patch mips-bcm47xx-fix-kconfig-dependency-bug-for-bcm47xx_.patch staging-greybus-codecs-fix-reference-counter-leak-in.patch diff --git a/queue-5.10/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch b/queue-5.10/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch deleted file mode 100644 index d1e181395e3..00000000000 --- a/queue-5.10/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 30e1c1cfc25fcbf0b2c23b22d247598e9ba3f193 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 7 Nov 2020 20:35:14 +0100 -Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan - -From: Vincent Bernat - -[ Upstream commit 1af5318c00a8acc33a90537af49b3f23f72a2c4b ] - -Introduced in 65324144b50b, the "proxy_arp_vlan" sysctl is a -per-interface sysctl to tune proxy ARP support for private VLANs. -While the "all" variant is exposed, it was a noop and never evaluated. -We use the usual "or" logic for this kind of sysctls. - -Fixes: 65324144b50b ("net: RFC3069, private VLAN proxy arp support") -Signed-off-by: Vincent Bernat -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - include/linux/inetdevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index 3bbcddd22df8c..53aa0343bf694 100644 ---- a/include/linux/inetdevice.h -+++ b/include/linux/inetdevice.h -@@ -105,7 +105,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) - - #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) - #define IN_DEV_PROXY_ARP(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP) --#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_CONF_GET(in_dev, PROXY_ARP_PVLAN) -+#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP_PVLAN) - #define IN_DEV_SHARED_MEDIA(in_dev) IN_DEV_ORCONF((in_dev), SHARED_MEDIA) - #define IN_DEV_TX_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), SEND_REDIRECTS) - #define IN_DEV_SEC_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), \ --- -2.27.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 5d61989b62c..d0205fd695c 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -95,7 +95,6 @@ asoc-wm8998-fix-pm-disable-depth-imbalance-on-error.patch spi-sprd-fix-reference-leak-in-sprd_spi_remove.patch virtiofs-fix-leak-in-setup.patch net-evaluate-net.ipvx.conf.all.ignore_routes_with_li.patch -net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch asoc-arizona-fix-a-wrong-free-in-wm8997_probe.patch rdma-mthca-work-around-wenum-conversion-warning.patch asoc-sof-intel-fix-kconfig-dependency-for-snd_intel_.patch diff --git a/queue-5.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch b/queue-5.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch deleted file mode 100644 index a08c4c584d9..00000000000 --- a/queue-5.4/net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5bbb656709fe0bfa56334220d3f40c7bd28bee2e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 7 Nov 2020 20:35:14 +0100 -Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan - -From: Vincent Bernat - -[ Upstream commit 1af5318c00a8acc33a90537af49b3f23f72a2c4b ] - -Introduced in 65324144b50b, the "proxy_arp_vlan" sysctl is a -per-interface sysctl to tune proxy ARP support for private VLANs. -While the "all" variant is exposed, it was a noop and never evaluated. -We use the usual "or" logic for this kind of sysctls. - -Fixes: 65324144b50b ("net: RFC3069, private VLAN proxy arp support") -Signed-off-by: Vincent Bernat -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - include/linux/inetdevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h -index 3bbcddd22df8c..53aa0343bf694 100644 ---- a/include/linux/inetdevice.h -+++ b/include/linux/inetdevice.h -@@ -105,7 +105,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) - - #define IN_DEV_LOG_MARTIANS(in_dev) IN_DEV_ORCONF((in_dev), LOG_MARTIANS) - #define IN_DEV_PROXY_ARP(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP) --#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_CONF_GET(in_dev, PROXY_ARP_PVLAN) -+#define IN_DEV_PROXY_ARP_PVLAN(in_dev) IN_DEV_ORCONF((in_dev), PROXY_ARP_PVLAN) - #define IN_DEV_SHARED_MEDIA(in_dev) IN_DEV_ORCONF((in_dev), SHARED_MEDIA) - #define IN_DEV_TX_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), SEND_REDIRECTS) - #define IN_DEV_SEC_REDIRECTS(in_dev) IN_DEV_ORCONF((in_dev), \ --- -2.27.0 - diff --git a/queue-5.4/series b/queue-5.4/series index bcbcc845362..05585187cf1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -121,7 +121,6 @@ selftest-bpf-add-missed-ip6ip6-test-back.patch asoc-wm8998-fix-pm-disable-depth-imbalance-on-error.patch spi-sprd-fix-reference-leak-in-sprd_spi_remove.patch net-evaluate-net.ipvx.conf.all.ignore_routes_with_li.patch -net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch asoc-arizona-fix-a-wrong-free-in-wm8997_probe.patch rdma-mthca-work-around-wenum-conversion-warning.patch mips-bcm47xx-fix-kconfig-dependency-bug-for-bcm47xx_.patch -- 2.47.3