aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-03 22:49:02 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-04 13:31:50 -0800
commit8b98a70c28a607a02b3c3d41bc9a4c141f421052 (patch)
tree7f3ad0f2476c993f7b4b84f2796f73c012e9fb41 /net
parentbonding: remove usage of dev->master (diff)
downloadlinux-dev-8b98a70c28a607a02b3c3d41bc9a4c141f421052.tar.xz
linux-dev-8b98a70c28a607a02b3c3d41bc9a4c141f421052.zip
net: remove no longer used netdev_set_bond_master() and netdev_set_master()
Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c63
1 files changed, 0 insertions, 63 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 53a9fefbc9af..a51ccf46e8b7 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4826,69 +4826,6 @@ void netdev_upper_dev_unlink(struct net_device *dev,
}
EXPORT_SYMBOL(netdev_upper_dev_unlink);
-/**
- * netdev_set_master - set up master pointer
- * @slave: slave device
- * @master: new master device
- *
- * Changes the master device of the slave. Pass %NULL to break the
- * bonding. The caller must hold the RTNL semaphore. On a failure
- * a negative errno code is returned. On success the reference counts
- * are adjusted and the function returns zero.
- */
-int netdev_set_master(struct net_device *slave, struct net_device *master)
-{
- struct net_device *old = slave->master;
- int err;
-
- ASSERT_RTNL();
-
- if (master) {
- if (old)
- return -EBUSY;
- err = netdev_master_upper_dev_link(slave, master);
- if (err)
- return err;
- }
-
- slave->master = master;
-
- if (old)
- netdev_upper_dev_unlink(slave, master);
-
- return 0;
-}
-EXPORT_SYMBOL(netdev_set_master);
-
-/**
- * netdev_set_bond_master - set up bonding master/slave pair
- * @slave: slave device
- * @master: new master device
- *
- * Changes the master device of the slave. Pass %NULL to break the
- * bonding. The caller must hold the RTNL semaphore. On a failure
- * a negative errno code is returned. On success %RTM_NEWLINK is sent
- * to the routing socket and the function returns zero.
- */
-int netdev_set_bond_master(struct net_device *slave, struct net_device *master)
-{
- int err;
-
- ASSERT_RTNL();
-
- err = netdev_set_master(slave, master);
- if (err)
- return err;
- if (master)
- slave->flags |= IFF_SLAVE;
- else
- slave->flags &= ~IFF_SLAVE;
-
- rtmsg_ifinfo(RTM_NEWLINK, slave, IFF_SLAVE);
- return 0;
-}
-EXPORT_SYMBOL(netdev_set_bond_master);
-
static void dev_change_rx_flags(struct net_device *dev, int flags)
{
const struct net_device_ops *ops = dev->netdev_ops;