Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b8da1a authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

net: dsa: Move FDB add/del implementation inside DSA 



Currently DSA uses switchdev's implementation of FDB add/del ndos. This
patch moves the implementation inside DSA in order to support the legacy
way for static FDB configuration.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9eb3e0f

net/dsa/dsa_priv.h

+7 −0
Original line number Diff line number Diff line
@@ -111,6 +111,13 @@ bool dsa_schedule_work(struct work_struct *work); 
/* legacy.c */

int dsa_legacy_register(void);

void dsa_legacy_unregister(void);

int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

		       struct net_device *dev,

		       const unsigned char *addr, u16 vid,

		       u16 flags);

int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

		       struct net_device *dev,

		       const unsigned char *addr, u16 vid);



/* port.c */

int dsa_port_set_state(struct dsa_port *dp, u8 state,

net/dsa/legacy.c

+22 −0
Original line number Diff line number Diff line
@@ -739,6 +739,28 @@ static int dsa_resume(struct device *d) 
}

#endif



/* legacy way, bypassing the bridge *****************************************/

int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

		       struct net_device *dev,

		       const unsigned char *addr, u16 vid,

		       u16 flags)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_port *dp = p->dp;



	return dsa_port_fdb_add(dp, addr, vid);

}



int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

		       struct net_device *dev,

		       const unsigned char *addr, u16 vid)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_port *dp = p->dp;



	return dsa_port_fdb_del(dp, addr, vid);

}



static SIMPLE_DEV_PM_OPS(dsa_pm_ops, dsa_suspend, dsa_resume);



static const struct of_device_id dsa_of_match_table[] = {

net/dsa/slave.c

+2 −12
Original line number Diff line number Diff line
@@ -250,12 +250,6 @@ static int dsa_slave_port_obj_add(struct net_device *dev, 
	 */



	switch (obj->id) {

	case SWITCHDEV_OBJ_ID_PORT_FDB:

		if (switchdev_trans_ph_prepare(trans))

			return 0;

		err = dsa_port_fdb_add(dp, SWITCHDEV_OBJ_PORT_FDB(obj)->addr,

				       SWITCHDEV_OBJ_PORT_FDB(obj)->vid);

		break;

	case SWITCHDEV_OBJ_ID_PORT_MDB:

		err = dsa_port_mdb_add(dp, SWITCHDEV_OBJ_PORT_MDB(obj), trans);

		break;
@@ -279,10 +273,6 @@ static int dsa_slave_port_obj_del(struct net_device *dev, 
	int err;



	switch (obj->id) {

	case SWITCHDEV_OBJ_ID_PORT_FDB:

		err = dsa_port_fdb_del(dp, SWITCHDEV_OBJ_PORT_FDB(obj)->addr,

				       SWITCHDEV_OBJ_PORT_FDB(obj)->vid);

		break;

	case SWITCHDEV_OBJ_ID_PORT_MDB:

		err = dsa_port_mdb_del(dp, SWITCHDEV_OBJ_PORT_MDB(obj));

		break;
@@ -985,8 +975,8 @@ static const struct net_device_ops dsa_slave_netdev_ops = { 
	.ndo_change_rx_flags	= dsa_slave_change_rx_flags,

	.ndo_set_rx_mode	= dsa_slave_set_rx_mode,

	.ndo_set_mac_address	= dsa_slave_set_mac_address,

	.ndo_fdb_add		= switchdev_port_fdb_add,

	.ndo_fdb_del		= switchdev_port_fdb_del,

	.ndo_fdb_add		= dsa_legacy_fdb_add,

	.ndo_fdb_del		= dsa_legacy_fdb_del,

	.ndo_fdb_dump		= switchdev_port_fdb_dump,

	.ndo_do_ioctl		= dsa_slave_ioctl,

	.ndo_get_iflink		= dsa_slave_get_iflink,