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

Commit 9d47c0a2 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

switchdev: s/swdev_/switchdev_/ 



Turned out that "switchdev" sticks. So just unify all related terms to use
this prefix.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebb9a03a

drivers/net/ethernet/rocker/rocker.c

+19 −18
Original line number Diff line number Diff line
@@ -4221,7 +4221,7 @@ static const struct net_device_ops rocker_port_netdev_ops = { 
 * swdev interface

 ********************/



static int rocker_port_swdev_parent_id_get(struct net_device *dev,

static int rocker_port_switchdev_parent_id_get(struct net_device *dev,

					       struct netdev_phys_item_id *psid)

{

	struct rocker_port *rocker_port = netdev_priv(dev);
@@ -4232,14 +4232,15 @@ static int rocker_port_swdev_parent_id_get(struct net_device *dev, 
	return 0;

}



static int rocker_port_swdev_port_stp_update(struct net_device *dev, u8 state)

static int rocker_port_switchdev_port_stp_update(struct net_device *dev,

						 u8 state)

{

	struct rocker_port *rocker_port = netdev_priv(dev);



	return rocker_port_stp_update(rocker_port, state);

}



static int rocker_port_swdev_fib_ipv4_add(struct net_device *dev,

static int rocker_port_switchdev_fib_ipv4_add(struct net_device *dev,

					      __be32 dst, int dst_len,

					      struct fib_info *fi,

					      u8 tos, u8 type,
@@ -4252,7 +4253,7 @@ static int rocker_port_swdev_fib_ipv4_add(struct net_device *dev, 
				    fi, tb_id, flags);

}



static int rocker_port_swdev_fib_ipv4_del(struct net_device *dev,

static int rocker_port_switchdev_fib_ipv4_del(struct net_device *dev,

					      __be32 dst, int dst_len,

					      struct fib_info *fi,

					      u8 tos, u8 type, u32 tb_id)
@@ -4264,11 +4265,11 @@ static int rocker_port_swdev_fib_ipv4_del(struct net_device *dev, 
				    fi, tb_id, flags);

}



static const struct swdev_ops rocker_port_swdev_ops = {

	.swdev_parent_id_get		= rocker_port_swdev_parent_id_get,

	.swdev_port_stp_update		= rocker_port_swdev_port_stp_update,

	.swdev_fib_ipv4_add		= rocker_port_swdev_fib_ipv4_add,

	.swdev_fib_ipv4_del		= rocker_port_swdev_fib_ipv4_del,

static const struct switchdev_ops rocker_port_switchdev_ops = {

	.switchdev_parent_id_get	= rocker_port_switchdev_parent_id_get,

	.switchdev_port_stp_update	= rocker_port_switchdev_port_stp_update,

	.switchdev_fib_ipv4_add		= rocker_port_switchdev_fib_ipv4_add,

	.switchdev_fib_ipv4_del		= rocker_port_switchdev_fib_ipv4_del,

};



/********************
@@ -4623,7 +4624,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) 
	rocker_port_dev_addr_init(rocker, rocker_port);

	dev->netdev_ops = &rocker_port_netdev_ops;

	dev->ethtool_ops = &rocker_port_ethtool_ops;

	dev->swdev_ops = &rocker_port_swdev_ops;

	dev->switchdev_ops = &rocker_port_switchdev_ops;

	netif_napi_add(dev, &rocker_port->napi_tx, rocker_port_poll_tx,

		       NAPI_POLL_WEIGHT);

	netif_napi_add(dev, &rocker_port->napi_rx, rocker_port_poll_rx,

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -1567,7 +1567,7 @@ struct net_device { 
	const struct net_device_ops *netdev_ops;

	const struct ethtool_ops *ethtool_ops;

#ifdef CONFIG_NET_SWITCHDEV

	const struct swdev_ops *swdev_ops;

	const struct switchdev_ops *switchdev_ops;

#endif



	const struct header_ops *header_ops;

include/net/switchdev.h

+15 −15
Original line number Diff line number Diff line
@@ -19,26 +19,26 @@ struct fib_info; 
/**

 * struct switchdev_ops - switchdev operations

 *

 * @swdev_parent_id_get: Called to get an ID of the switch chip this port

 * @switchdev_parent_id_get: Called to get an ID of the switch chip this port

 *   is part of.  If driver implements this, it indicates that it

 *   represents a port of a switch chip.

 *

 * @swdev_port_stp_update: Called to notify switch device port of bridge

 * @switchdev_port_stp_update: Called to notify switch device port of bridge

 *   port STP state change.

 *

 * @swdev_fib_ipv4_add: Called to add/modify IPv4 route to switch device.

 * @switchdev_fib_ipv4_add: Called to add/modify IPv4 route to switch device.

 *

 * @swdev_fib_ipv4_del: Called to delete IPv4 route from switch device.

 * @switchdev_fib_ipv4_del: Called to delete IPv4 route from switch device.

 */

struct swdev_ops {

	int	(*swdev_parent_id_get)(struct net_device *dev,

struct switchdev_ops {

	int	(*switchdev_parent_id_get)(struct net_device *dev,

					   struct netdev_phys_item_id *psid);

	int	(*swdev_port_stp_update)(struct net_device *dev, u8 state);

	int	(*swdev_fib_ipv4_add)(struct net_device *dev, __be32 dst,

	int	(*switchdev_port_stp_update)(struct net_device *dev, u8 state);

	int	(*switchdev_fib_ipv4_add)(struct net_device *dev, __be32 dst,

					  int dst_len, struct fib_info *fi,

					  u8 tos, u8 type, u32 nlflags,

					  u32 tb_id);

	int	(*swdev_fib_ipv4_del)(struct net_device *dev, __be32 dst,

	int	(*switchdev_fib_ipv4_del)(struct net_device *dev, __be32 dst,

					  int dst_len, struct fib_info *fi,

					  u8 tos, u8 type, u32 tb_id);

};

net/dsa/slave.c

+4 −4
Original line number Diff line number Diff line
@@ -675,9 +675,9 @@ static const struct net_device_ops dsa_slave_netdev_ops = { 
	.ndo_get_iflink		= dsa_slave_get_iflink,

};



static const struct swdev_ops dsa_slave_swdev_ops = {

	.swdev_parent_id_get = dsa_slave_parent_id_get,

	.swdev_port_stp_update = dsa_slave_stp_update,

static const struct switchdev_ops dsa_slave_switchdev_ops = {

	.switchdev_parent_id_get	= dsa_slave_parent_id_get,

	.switchdev_port_stp_update	= dsa_slave_stp_update,

};



static void dsa_slave_adjust_link(struct net_device *dev)
@@ -866,7 +866,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent, 
	eth_hw_addr_inherit(slave_dev, master);

	slave_dev->tx_queue_len = 0;

	slave_dev->netdev_ops = &dsa_slave_netdev_ops;

	slave_dev->swdev_ops = &dsa_slave_swdev_ops;

	slave_dev->switchdev_ops = &dsa_slave_switchdev_ops;



	netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,

				 NULL);

net/switchdev/switchdev.c

+20 −20
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 
int switchdev_parent_id_get(struct net_device *dev,

			    struct netdev_phys_item_id *psid)

{

	const struct swdev_ops *ops = dev->swdev_ops;

	const struct switchdev_ops *ops = dev->switchdev_ops;



	if (!ops || !ops->swdev_parent_id_get)

	if (!ops || !ops->switchdev_parent_id_get)

		return -EOPNOTSUPP;

	return ops->swdev_parent_id_get(dev, psid);

	return ops->switchdev_parent_id_get(dev, psid);

}

EXPORT_SYMBOL_GPL(switchdev_parent_id_get);
@@ -46,13 +46,13 @@ EXPORT_SYMBOL_GPL(switchdev_parent_id_get); 
 */

int switchdev_port_stp_update(struct net_device *dev, u8 state)

{

	const struct swdev_ops *ops = dev->swdev_ops;

	const struct switchdev_ops *ops = dev->switchdev_ops;

	struct net_device *lower_dev;

	struct list_head *iter;

	int err = -EOPNOTSUPP;



	if (ops && ops->swdev_port_stp_update)

		return ops->swdev_port_stp_update(dev, state);

	if (ops && ops->switchdev_port_stp_update)

		return ops->switchdev_port_stp_update(dev, state);



	netdev_for_each_lower_dev(dev, lower_dev, iter) {

		err = switchdev_port_stp_update(lower_dev, state);
@@ -239,17 +239,17 @@ EXPORT_SYMBOL_GPL(ndo_dflt_switchdev_port_bridge_dellink); 


static struct net_device *switchdev_get_lowest_dev(struct net_device *dev)

{

	const struct swdev_ops *ops = dev->swdev_ops;

	const struct switchdev_ops *ops = dev->switchdev_ops;

	struct net_device *lower_dev;

	struct net_device *port_dev;

	struct list_head *iter;



	/* Recusively search down until we find a sw port dev.

	 * (A sw port dev supports swdev_parent_id_get).

	 * (A sw port dev supports switchdev_parent_id_get).

	 */



	if (dev->features & NETIF_F_HW_SWITCH_OFFLOAD &&

	    ops && ops->swdev_parent_id_get)

	    ops && ops->switchdev_parent_id_get)

		return dev;



	netdev_for_each_lower_dev(dev, lower_dev, iter) {
@@ -313,7 +313,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, 
			   u8 tos, u8 type, u32 nlflags, u32 tb_id)

{

	struct net_device *dev;

	const struct swdev_ops *ops;

	const struct switchdev_ops *ops;

	int err = 0;



	/* Don't offload route if using custom ip rules or if
@@ -331,10 +331,10 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, 
	dev = switchdev_get_dev_by_nhs(fi);

	if (!dev)

		return 0;

	ops = dev->swdev_ops;

	ops = dev->switchdev_ops;



	if (ops->swdev_fib_ipv4_add) {

		err = ops->swdev_fib_ipv4_add(dev, htonl(dst), dst_len,

	if (ops->switchdev_fib_ipv4_add) {

		err = ops->switchdev_fib_ipv4_add(dev, htonl(dst), dst_len,

						  fi, tos, type, nlflags,

						  tb_id);

		if (!err)
@@ -361,7 +361,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, 
			   u8 tos, u8 type, u32 tb_id)

{

	struct net_device *dev;

	const struct swdev_ops *ops;

	const struct switchdev_ops *ops;

	int err = 0;



	if (!(fi->fib_flags & RTNH_F_EXTERNAL))
@@ -370,10 +370,10 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, 
	dev = switchdev_get_dev_by_nhs(fi);

	if (!dev)

		return 0;

	ops = dev->swdev_ops;

	ops = dev->switchdev_ops;



	if (ops->swdev_fib_ipv4_del) {

		err = ops->swdev_fib_ipv4_del(dev, htonl(dst), dst_len,

	if (ops->switchdev_fib_ipv4_del) {

		err = ops->switchdev_fib_ipv4_del(dev, htonl(dst), dst_len,

						  fi, tos, type, tb_id);

		if (!err)

			fi->fib_flags &= ~RTNH_F_EXTERNAL;