diff options
author | Jiri Pirko <jiri@resnulli.us> | 2015-05-10 12:47:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-12 18:43:53 -0400 |
commit | 9d47c0a2d958e06322c88245749278633d333cca (patch) | |
tree | 1d431bb9c061f7af2a934c23cbb66aeec8a3c598 /net/dsa/slave.c | |
parent | ebb9a03a590e2325f747be43c8db450e92509501 (diff) |
switchdev: s/swdev_/switchdev_/
Turned out that "switchdev" sticks. So just unify all related terms to use
this prefix.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r-- | net/dsa/slave.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 03e041addea3..1546acf6ebd3 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
@@ -675,9 +675,9 @@ static const struct net_device_ops dsa_slave_netdev_ops = { | |||
675 | .ndo_get_iflink = dsa_slave_get_iflink, | 675 | .ndo_get_iflink = dsa_slave_get_iflink, |
676 | }; | 676 | }; |
677 | 677 | ||
678 | static const struct swdev_ops dsa_slave_swdev_ops = { | 678 | static const struct switchdev_ops dsa_slave_switchdev_ops = { |
679 | .swdev_parent_id_get = dsa_slave_parent_id_get, | 679 | .switchdev_parent_id_get = dsa_slave_parent_id_get, |
680 | .swdev_port_stp_update = dsa_slave_stp_update, | 680 | .switchdev_port_stp_update = dsa_slave_stp_update, |
681 | }; | 681 | }; |
682 | 682 | ||
683 | static void dsa_slave_adjust_link(struct net_device *dev) | 683 | 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, | |||
866 | eth_hw_addr_inherit(slave_dev, master); | 866 | eth_hw_addr_inherit(slave_dev, master); |
867 | slave_dev->tx_queue_len = 0; | 867 | slave_dev->tx_queue_len = 0; |
868 | slave_dev->netdev_ops = &dsa_slave_netdev_ops; | 868 | slave_dev->netdev_ops = &dsa_slave_netdev_ops; |
869 | slave_dev->swdev_ops = &dsa_slave_swdev_ops; | 869 | slave_dev->switchdev_ops = &dsa_slave_switchdev_ops; |
870 | 870 | ||
871 | netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one, | 871 | netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one, |
872 | NULL); | 872 | NULL); |