Commit 3e66fd54 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mirroring-for-ocelot-switches' 

Vladimir Oltean says:

====================
Mirroring for Ocelot switches

This series adds support for tc-matchall (port-based) and tc-flower
(flow-based) offloading of the tc-mirred action. Support has been added
for both the ocelot switchdev driver and felix DSA driver.
====================

Link: https://lore.kernel.org/r/20220316204144.2679277-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2b341f75 5e497497

drivers/net/dsa/b53/b53_common.c

+2 −1
Original line number Diff line number Diff line
@@ -2110,7 +2110,8 @@ enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port, 
EXPORT_SYMBOL(b53_get_tag_protocol);



int b53_mirror_add(struct dsa_switch *ds, int port,

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress)

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress,

		   struct netlink_ext_ack *extack)

{

	struct b53_device *dev = ds->priv;

	u16 reg, loc;

drivers/net/dsa/b53/b53_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ int b53_mdb_del(struct dsa_switch *ds, int port, 
		const struct switchdev_obj_port_mdb *mdb,

		struct dsa_db db);

int b53_mirror_add(struct dsa_switch *ds, int port,

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress);

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress,

		   struct netlink_ext_ack *extack);

enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port,

					   enum dsa_tag_protocol mprot);

void b53_mirror_del(struct dsa_switch *ds, int port,

drivers/net/dsa/microchip/ksz8795.c

+1 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ static int ksz8_port_vlan_del(struct dsa_switch *ds, int port, 


static int ksz8_port_mirror_add(struct dsa_switch *ds, int port,

				struct dsa_mall_mirror_tc_entry *mirror,

				bool ingress)

				bool ingress, struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;

drivers/net/dsa/microchip/ksz9477.c

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static int ksz9477_port_mdb_del(struct dsa_switch *ds, int port, 


static int ksz9477_port_mirror_add(struct dsa_switch *ds, int port,

				   struct dsa_mall_mirror_tc_entry *mirror,

				   bool ingress)

				   bool ingress, struct netlink_ext_ack *extack)

{

	struct ksz_device *dev = ds->priv;

drivers/net/dsa/mt7530.c

+1 −1
Original line number Diff line number Diff line
@@ -1714,7 +1714,7 @@ static int mt753x_mirror_port_set(unsigned int id, u32 val) 


static int mt753x_port_mirror_add(struct dsa_switch *ds, int port,

				  struct dsa_mall_mirror_tc_entry *mirror,

				  bool ingress)

				  bool ingress, struct netlink_ext_ack *extack)

{

	struct mt7530_priv *priv = ds->priv;

	int monitor_port;