bonding: make release_and_destroy static
Subsystems (3)
PATCH 1/1 bonding: make release_and_destroy static
Only used in main file.
Signed-off-by Stephen Hemminger <[email protected]>
drivers/net/bonding/bond_main.c +2 -2
@@ -2057,8 +2057,8 @@ int bond_release(struct net_device *bond* 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;
drivers/net/bonding/bonding.h +0 -1
@@ -334,7 +334,6 @@ static inline void bond_unset_master_albstruct 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);
Quoted 20 lines · Stephen Hemminger
Only used in main file.
Signed-off-by Stephen Hemminger <[email protected]>drivers/net/bonding/bond_main.c +2
-2@@ -2057,8 +2057,8 @@ int bond_release(struct net_device *bond* 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;
drivers/net/bonding/bonding.h static inline void bond_unset_master_alb · line 339
Quoted 7 lines
drivers/net/bonding/bonding.h +0
-1@@ -334,7 +334,6 @@ static inline void bond_unset_master_albstruct 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);
Seems fine.
Acked-by Andy Gospodarek <[email protected]>
Quoted 31 lines · Andy Gospodarek
Quoted 20 lines · Stephen Hemminger
Only used in main file.
Signed-off-by Stephen Hemminger <[email protected]>drivers/net/bonding/bond_main.c +2
-2@@ -2057,8 +2057,8 @@ int bond_release(struct net_device *bond* 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;drivers/net/bonding/bonding.h static inline void bond_unset_master_alb · line 339
Quoted 7 lines
drivers/net/bonding/bonding.h +0
-1@@ -334,7 +334,6 @@ static inline void bond_unset_master_albstruct 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);Seems fine.
Quoted 1 line
Acked-by Andy Gospodarek <[email protected]>
Signed-off-by Jay Vosburgh <[email protected]>
-J
---
-Jay Vosburgh, IBM Linux Technology Center, [email protected]
From: Stephen Hemminger <[email protected]>
Date: Fri, 15 Oct 2010 08:09:34 -0700
Quoted 3 lines
Only used in main file.
Signed-off-by Stephen Hemminger <[email protected]>
Applied.