diff options
-rw-r--r-- | drivers/net/bonding/bond_main.c | 4 | ||||
-rw-r--r-- | drivers/net/bonding/bonding.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index f80f13260b32..beb3b7cecd52 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2057,8 +2057,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) | |||
2057 | * First release a slave and than destroy the bond if no more slaves are left. | 2057 | * First release a slave and than destroy the bond if no more slaves are left. |
2058 | * Must be under rtnl_lock when this function is called. | 2058 | * Must be under rtnl_lock when this function is called. |
2059 | */ | 2059 | */ |
2060 | int bond_release_and_destroy(struct net_device *bond_dev, | 2060 | static int bond_release_and_destroy(struct net_device *bond_dev, |
2061 | struct net_device *slave_dev) | 2061 | struct net_device *slave_dev) |
2062 | { | 2062 | { |
2063 | struct bonding *bond = netdev_priv(bond_dev); | 2063 | struct bonding *bond = netdev_priv(bond_dev); |
2064 | int ret; | 2064 | int ret; |
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 2c12a5f812f4..4eedb12df6ca 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -364,7 +364,6 @@ static inline void bond_unset_master_alb_flags(struct bonding *bond) | |||
364 | struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); | 364 | struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); |
365 | int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); | 365 | int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); |
366 | int bond_create(struct net *net, const char *name); | 366 | int bond_create(struct net *net, const char *name); |
367 | int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev); | ||
368 | int bond_create_sysfs(void); | 367 | int bond_create_sysfs(void); |
369 | void bond_destroy_sysfs(void); | 368 | void bond_destroy_sysfs(void); |
370 | void bond_prepare_sysfs_group(struct bonding *bond); | 369 | void bond_prepare_sysfs_group(struct bonding *bond); |