Drop net-evaluate-net.ipv4.conf.all.proxy_arp_pvlan.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

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 (file)
index bf989b9..0000000
--- 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 <sashal@kernel.org>
-Date: Sat, 7 Nov 2020 20:35:14 +0100
-Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan
-
-From: Vincent Bernat <vincent@bernat.ch>
-
-[ 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 <vincent@bernat.ch>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 4ab5fcc5687db91fcea1b4b94e2df16dcbd9484b..18a440e6c83c58d383cb281bfd2478ee156cfacb 100644 (file)
--- 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 (file)
index f16a545..0000000
--- 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 <sashal@kernel.org>
-Date: Sat, 7 Nov 2020 20:35:14 +0100
-Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan
-
-From: Vincent Bernat <vincent@bernat.ch>
-
-[ 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 <vincent@bernat.ch>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 0d68cbac9b66c790a784b5e9bda1cf202de2b373..8141e1fc00cddab1c076550b8e03e4f2168c5d15 100644 (file)
--- 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 (file)
index 3226869..0000000
--- 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 <sashal@kernel.org>
-Date: Sat, 7 Nov 2020 20:35:14 +0100
-Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan
-
-From: Vincent Bernat <vincent@bernat.ch>
-
-[ 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 <vincent@bernat.ch>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 7f984696b37aad726bd41f66356684f6de749330..14d32c64660dd5cff4ba1e28eeb8dc3d5bba478f 100644 (file)
--- 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 (file)
index 491fc17..0000000
--- 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 <sashal@kernel.org>
-Date: Sat, 7 Nov 2020 20:35:14 +0100
-Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan
-
-From: Vincent Bernat <vincent@bernat.ch>
-
-[ 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 <vincent@bernat.ch>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 129142f1afa953754fd6ad7b247a699b9dffda1d..d0ba6d16ed5b06ee14097f4444b005648e8367c6 100644 (file)
--- 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 (file)
index d1e1813..0000000
--- 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 <sashal@kernel.org>
-Date: Sat, 7 Nov 2020 20:35:14 +0100
-Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan
-
-From: Vincent Bernat <vincent@bernat.ch>
-
-[ 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 <vincent@bernat.ch>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 5d61989b62c92908ec79722a906289f1462fce80..d0205fd695c456adfe551518b213129dafb516b6 100644 (file)
--- 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 (file)
index a08c4c5..0000000
--- 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 <sashal@kernel.org>
-Date: Sat, 7 Nov 2020 20:35:14 +0100
-Subject: net: evaluate net.ipv4.conf.all.proxy_arp_pvlan
-
-From: Vincent Bernat <vincent@bernat.ch>
-
-[ 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 <vincent@bernat.ch>
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 bcbcc8453626a4841fd3499d63af23073d0e88ca..05585187cf158953dbebd55aafdee32eb49cb589 100644 (file)
--- 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