diff options
| author | stephen hemminger | 2010-10-15 07:09:34 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-10-21 12:09:46 +0200 |
| commit | 26d8ee75e08cfca8b65ade871d68c8cd96e4ea23 (patch) | |
| tree | d27ed544e355915b8624a59ebcdc97d1a3e3a118 | |
| parent | xfrm: make xfrm_bundle_ok local (diff) | |
| download | kernel-qcow2-linux-26d8ee75e08cfca8b65ade871d68c8cd96e4ea23.tar.gz kernel-qcow2-linux-26d8ee75e08cfca8b65ade871d68c8cd96e4ea23.tar.xz kernel-qcow2-linux-26d8ee75e08cfca8b65ade871d68c8cd96e4ea23.zip | |
bonding: make release_and_destroy static
Only used in main file.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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) * First release a slave and than destroy the bond if no more slaves are left. * Must be under rtnl_lock when this function is called. */ -int bond_release_and_destroy(struct net_device *bond_dev, - struct net_device *slave_dev) +static int bond_release_and_destroy(struct net_device *bond_dev, + struct net_device *slave_dev) { struct bonding *bond = netdev_priv(bond_dev); 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) struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); int bond_create(struct net *net, const char *name); -int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev); int bond_create_sysfs(void); void bond_destroy_sysfs(void); void bond_prepare_sysfs_group(struct bonding *bond); |