From 4073513fc47270036eb5c8e55d26b5ce8514c830 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Feb 2022 18:54:49 +0100 Subject: [PATCH] drop net-dsa-lan9303-add-vlan-ids-to-master-device.patch from 5.10 and 5.4 --- ...an9303-add-vlan-ids-to-master-device.patch | 75 ------------------- queue-5.10/series | 1 - ...an9303-add-vlan-ids-to-master-device.patch | 75 ------------------- queue-5.4/series | 1 - 4 files changed, 152 deletions(-) delete mode 100644 queue-5.10/net-dsa-lan9303-add-vlan-ids-to-master-device.patch delete mode 100644 queue-5.4/net-dsa-lan9303-add-vlan-ids-to-master-device.patch diff --git a/queue-5.10/net-dsa-lan9303-add-vlan-ids-to-master-device.patch b/queue-5.10/net-dsa-lan9303-add-vlan-ids-to-master-device.patch deleted file mode 100644 index ba13e2a6f31..00000000000 --- a/queue-5.10/net-dsa-lan9303-add-vlan-ids-to-master-device.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 430065e2671905ac675f97b7af240cc255964e93 Mon Sep 17 00:00:00 2001 -From: Mans Rullgard -Date: Wed, 16 Feb 2022 20:48:18 +0000 -Subject: net: dsa: lan9303: add VLAN IDs to master device - -From: Mans Rullgard - -commit 430065e2671905ac675f97b7af240cc255964e93 upstream. - -If the master device does VLAN filtering, the IDs used by the switch -must be added for any frames to be received. Do this in the -port_enable() function, and remove them in port_disable(). - -Fixes: a1292595e006 ("net: dsa: add new DSA switch driver for the SMSC-LAN9303") -Signed-off-by: Mans Rullgard -Reviewed-by: Florian Fainelli -Reviewed-by: Vladimir Oltean -Link: https://lore.kernel.org/r/20220216204818.28746-1-mans@mansr.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/dsa/Kconfig | 1 + - drivers/net/dsa/lan9303-core.c | 11 +++++++++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - ---- a/drivers/net/dsa/Kconfig -+++ b/drivers/net/dsa/Kconfig -@@ -82,6 +82,7 @@ config NET_DSA_REALTEK_SMI - - config NET_DSA_SMSC_LAN9303 - tristate -+ depends on VLAN_8021Q || VLAN_8021Q=n - select NET_DSA_TAG_LAN9303 - select REGMAP - help ---- a/drivers/net/dsa/lan9303-core.c -+++ b/drivers/net/dsa/lan9303-core.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - - #include "lan9303.h" -@@ -1083,21 +1084,27 @@ static void lan9303_adjust_link(struct d - static int lan9303_port_enable(struct dsa_switch *ds, int port, - struct phy_device *phy) - { -+ struct dsa_port *dp = dsa_to_port(ds, port); - struct lan9303 *chip = ds->priv; - -- if (!dsa_is_user_port(ds, port)) -+ if (!dsa_port_is_user(dp)) - return 0; - -+ vlan_vid_add(dp->cpu_dp->master, htons(ETH_P_8021Q), port); -+ - return lan9303_enable_processing_port(chip, port); - } - - static void lan9303_port_disable(struct dsa_switch *ds, int port) - { -+ struct dsa_port *dp = dsa_to_port(ds, port); - struct lan9303 *chip = ds->priv; - -- if (!dsa_is_user_port(ds, port)) -+ if (!dsa_port_is_user(dp)) - return; - -+ vlan_vid_del(dp->cpu_dp->master, htons(ETH_P_8021Q), port); -+ - lan9303_disable_processing_port(chip, port); - lan9303_phy_write(ds, chip->phy_addr_base + port, MII_BMCR, BMCR_PDOWN); - } diff --git a/queue-5.10/series b/queue-5.10/series index 7bbfad8bcde..48af4669f21 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -56,7 +56,6 @@ netfilter-nft_synproxy-unregister-hooks-on-init-error-path.patch ipv6-per-netns-exclusive-flowlabel-checks.patch net-dsa-lan9303-fix-reset-on-probe.patch net-dsa-lantiq_gswip-fix-use-after-free-in-gswip_remove.patch -net-dsa-lan9303-add-vlan-ids-to-master-device.patch net-ieee802154-ca8210-fix-lifs-sifs-periods.patch ping-fix-the-dif-and-sdif-check-in-ping_lookup.patch bonding-force-carrier-update-when-releasing-slave.patch diff --git a/queue-5.4/net-dsa-lan9303-add-vlan-ids-to-master-device.patch b/queue-5.4/net-dsa-lan9303-add-vlan-ids-to-master-device.patch deleted file mode 100644 index 32f22f8936c..00000000000 --- a/queue-5.4/net-dsa-lan9303-add-vlan-ids-to-master-device.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 430065e2671905ac675f97b7af240cc255964e93 Mon Sep 17 00:00:00 2001 -From: Mans Rullgard -Date: Wed, 16 Feb 2022 20:48:18 +0000 -Subject: net: dsa: lan9303: add VLAN IDs to master device - -From: Mans Rullgard - -commit 430065e2671905ac675f97b7af240cc255964e93 upstream. - -If the master device does VLAN filtering, the IDs used by the switch -must be added for any frames to be received. Do this in the -port_enable() function, and remove them in port_disable(). - -Fixes: a1292595e006 ("net: dsa: add new DSA switch driver for the SMSC-LAN9303") -Signed-off-by: Mans Rullgard -Reviewed-by: Florian Fainelli -Reviewed-by: Vladimir Oltean -Link: https://lore.kernel.org/r/20220216204818.28746-1-mans@mansr.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/dsa/Kconfig | 1 + - drivers/net/dsa/lan9303-core.c | 11 +++++++++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - ---- a/drivers/net/dsa/Kconfig -+++ b/drivers/net/dsa/Kconfig -@@ -76,6 +76,7 @@ config NET_DSA_REALTEK_SMI - - config NET_DSA_SMSC_LAN9303 - tristate -+ depends on VLAN_8021Q || VLAN_8021Q=n - select NET_DSA_TAG_LAN9303 - select REGMAP - ---help--- ---- a/drivers/net/dsa/lan9303-core.c -+++ b/drivers/net/dsa/lan9303-core.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - - #include "lan9303.h" -@@ -1083,21 +1084,27 @@ static void lan9303_adjust_link(struct d - static int lan9303_port_enable(struct dsa_switch *ds, int port, - struct phy_device *phy) - { -+ struct dsa_port *dp = dsa_to_port(ds, port); - struct lan9303 *chip = ds->priv; - -- if (!dsa_is_user_port(ds, port)) -+ if (!dsa_port_is_user(dp)) - return 0; - -+ vlan_vid_add(dp->cpu_dp->master, htons(ETH_P_8021Q), port); -+ - return lan9303_enable_processing_port(chip, port); - } - - static void lan9303_port_disable(struct dsa_switch *ds, int port) - { -+ struct dsa_port *dp = dsa_to_port(ds, port); - struct lan9303 *chip = ds->priv; - -- if (!dsa_is_user_port(ds, port)) -+ if (!dsa_port_is_user(dp)) - return; - -+ vlan_vid_del(dp->cpu_dp->master, htons(ETH_P_8021Q), port); -+ - lan9303_disable_processing_port(chip, port); - lan9303_phy_write(ds, chip->phy_addr_base + port, MII_BMCR, BMCR_PDOWN); - } diff --git a/queue-5.4/series b/queue-5.4/series index 81175500fc2..60965180a5f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -37,7 +37,6 @@ iwlwifi-pcie-fix-locking-when-hw-not-ready.patch iwlwifi-pcie-gen2-fix-locking-when-hw-not-ready.patch netfilter-nft_synproxy-unregister-hooks-on-init-error-path.patch net-dsa-lan9303-fix-reset-on-probe.patch -net-dsa-lan9303-add-vlan-ids-to-master-device.patch net-ieee802154-ca8210-fix-lifs-sifs-periods.patch ping-fix-the-dif-and-sdif-check-in-ping_lookup.patch bonding-force-carrier-update-when-releasing-slave.patch -- 2.47.3