aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-03 17:49:02 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-04 16:31:50 -0500
commit8b98a70c28a607a02b3c3d41bc9a4c141f421052 (patch)
tree7f3ad0f2476c993f7b4b84f2796f73c012e9fb41 /include
parent471cb5a33dcbd7c529684a2ac7ba4451414ee4a7 (diff)
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')
-rw-r--r--include/linux/netdevice.h6
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 {
858 * flow_id is a flow ID to be passed to rps_may_expire_flow() later. 858 * flow_id is a flow ID to be passed to rps_may_expire_flow() later.
859 * Return the filter ID on success, or a negative error code. 859 * Return the filter ID on success, or a negative error code.
860 * 860 *
861 * Slave management functions (for bridge, bonding, etc). User should 861 * Slave management functions (for bridge, bonding, etc).
862 * call netdev_set_master() to set dev->master properly.
863 * int (*ndo_add_slave)(struct net_device *dev, struct net_device *slave_dev); 862 * int (*ndo_add_slave)(struct net_device *dev, struct net_device *slave_dev);
864 * Called to make another netdev an underling. 863 * Called to make another netdev an underling.
865 * 864 *
@@ -2650,9 +2649,6 @@ extern int netdev_master_upper_dev_link(struct net_device *dev,
2650 struct net_device *upper_dev); 2649 struct net_device *upper_dev);
2651extern void netdev_upper_dev_unlink(struct net_device *dev, 2650extern void netdev_upper_dev_unlink(struct net_device *dev,
2652 struct net_device *upper_dev); 2651 struct net_device *upper_dev);
2653extern int netdev_set_master(struct net_device *dev, struct net_device *master);
2654extern int netdev_set_bond_master(struct net_device *dev,
2655 struct net_device *master);
2656extern int skb_checksum_help(struct sk_buff *skb); 2652extern int skb_checksum_help(struct sk_buff *skb);
2657extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, 2653extern struct sk_buff *skb_gso_segment(struct sk_buff *skb,
2658 netdev_features_t features); 2654 netdev_features_t features);