diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-01-03 22:49:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-04 13:31:50 -0800 |
| commit | 8b98a70c28a607a02b3c3d41bc9a4c141f421052 (patch) | |
| tree | 7f3ad0f2476c993f7b4b84f2796f73c012e9fb41 /include/linux/netdevice.h | |
| parent | 471cb5a33dcbd7c529684a2ac7ba4451414ee4a7 (diff) | |
| download | linux-8b98a70c28a607a02b3c3d41bc9a4c141f421052.tar.gz linux-8b98a70c28a607a02b3c3d41bc9a4c141f421052.tar.bz2 linux-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 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e324601f48e8..3cad8eab02b6 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -858,8 +858,7 @@ struct netdev_fcoe_hbainfo { * flow_id is a flow ID to be passed to rps_may_expire_flow() later. * Return the filter ID on success, or a negative error code. * - * Slave management functions (for bridge, bonding, etc). User should - * call netdev_set_master() to set dev->master properly. + * Slave management functions (for bridge, bonding, etc). * int (*ndo_add_slave)(struct net_device *dev, struct net_device *slave_dev); * Called to make another netdev an underling. * @@ -2650,9 +2649,6 @@ extern int netdev_master_upper_dev_link(struct net_device *dev, struct net_device *upper_dev); extern void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev); -extern int netdev_set_master(struct net_device *dev, struct net_device *master); -extern int netdev_set_bond_master(struct net_device *dev, - struct net_device *master); extern int skb_checksum_help(struct sk_buff *skb); extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, netdev_features_t features); |