You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
109 lines
3.3 KiB
Diff
109 lines
3.3 KiB
Diff
From 829d9def89b452c4d13d15fd578dea524d9f8521 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
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 <vladimir.oltean@nxp.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
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)
|
|
{
|