From 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 21 Mar 2022 01:16:48 +0000 Subject: kernel: delete Linux 5.4 config and patches As the upcoming release will be based on Linux 5.10 only, remove all kernel configuration as well as patches for Linux 5.4. There were no targets still actively using Linux 5.4. Signed-off-by: Daniel Golle (cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606) --- ...elot-break-apart-vlan-operations-into-oce.patch | 108 --------------------- 1 file changed, 108 deletions(-) delete mode 100644 target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch (limited to 'target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch') diff --git a/target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch b/target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch deleted file mode 100644 index d2b2cfcc67..0000000000 --- a/target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 829d9def89b452c4d13d15fd578dea524d9f8521 Mon Sep 17 00:00:00 2001 -From: Vladimir Oltean -Date: Sat, 9 Nov 2019 15:02:48 +0200 -Subject: [PATCH] net: mscc: ocelot: break apart vlan operations into - ocelot_vlan_{add, del} - -We need an implementation of these functions that is agnostic to the -higher layer (switchdev or dsa). - -Signed-off-by: Vladimir Oltean -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/mscc/ocelot.c | 60 ++++++++++++++++++++++++++------------ - 1 file changed, 42 insertions(+), 18 deletions(-) - ---- a/drivers/net/ethernet/mscc/ocelot.c -+++ b/drivers/net/ethernet/mscc/ocelot.c -@@ -270,18 +270,11 @@ static void ocelot_port_set_pvid(struct - ocelot_port->pvid = pvid; - } - --static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, -- bool untagged) -+static int ocelot_vlan_add(struct ocelot *ocelot, int port, u16 vid, bool pvid, -+ bool untagged) - { -- struct ocelot_port *ocelot_port = netdev_priv(dev); -- struct ocelot *ocelot = ocelot_port->ocelot; -- int port = ocelot_port->chip_port; - int ret; - -- /* Add the port MAC address to with the right VLAN information */ -- ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, vid, -- ENTRYTYPE_LOCKED); -- - /* Make the port a member of the VLAN */ - ocelot->vlan_mask[vid] |= BIT(port); - ret = ocelot_vlant_set_mask(ocelot, vid, ocelot->vlan_mask[vid]); -@@ -302,22 +295,29 @@ static int ocelot_vlan_vid_add(struct ne - return 0; - } - --static int ocelot_vlan_vid_del(struct net_device *dev, u16 vid) -+static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, -+ bool untagged) - { - struct ocelot_port *ocelot_port = netdev_priv(dev); - struct ocelot *ocelot = ocelot_port->ocelot; - int port = ocelot_port->chip_port; - int ret; - -- /* 8021q removes VID 0 on module unload for all interfaces -- * with VLAN filtering feature. We need to keep it to receive -- * untagged traffic. -- */ -- if (vid == 0) -- return 0; -+ ret = ocelot_vlan_add(ocelot, port, vid, pvid, untagged); -+ if (ret) -+ return ret; - -- /* Del the port MAC address to with the right VLAN information */ -- ocelot_mact_forget(ocelot, dev->dev_addr, vid); -+ /* Add the port MAC address to with the right VLAN information */ -+ ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, vid, -+ ENTRYTYPE_LOCKED); -+ -+ return 0; -+} -+ -+static int ocelot_vlan_del(struct ocelot *ocelot, int port, u16 vid) -+{ -+ struct ocelot_port *ocelot_port = ocelot->ports[port]; -+ int ret; - - /* Stop the port from being a member of the vlan */ - ocelot->vlan_mask[vid] &= ~BIT(port); -@@ -335,6 +335,30 @@ static int ocelot_vlan_vid_del(struct ne - - return 0; - } -+ -+static int ocelot_vlan_vid_del(struct net_device *dev, u16 vid) -+{ -+ struct ocelot_port *ocelot_port = netdev_priv(dev); -+ struct ocelot *ocelot = ocelot_port->ocelot; -+ int port = ocelot_port->chip_port; -+ int ret; -+ -+ /* 8021q removes VID 0 on module unload for all interfaces -+ * with VLAN filtering feature. We need to keep it to receive -+ * untagged traffic. -+ */ -+ if (vid == 0) -+ return 0; -+ -+ ret = ocelot_vlan_del(ocelot, port, vid); -+ if (ret) -+ return ret; -+ -+ /* Del the port MAC address to with the right VLAN information */ -+ ocelot_mact_forget(ocelot, dev->dev_addr, vid); -+ -+ return 0; -+} - - static void ocelot_vlan_init(struct ocelot *ocelot) - { -- cgit v1.2.3