Skip to contentSkip to conversation

bonding: make release_and_destroy static

PATCH Applied Stephen Hemminger 4 participants 4 messages Oct 15, 2010 – Oct 21, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bonding: make release_and_destroy static

Only used in main file.

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_alb
 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);
Acked-by on v1 1/1
#1 lore raw
Quoted 20 lines · Stephen Hemminger

Only used in main file.

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_alb
 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);

Seems fine.

#2 lore raw
Quoted 31 lines · Andy Gospodarek
Quoted 20 lines · Stephen Hemminger

Only used in main file.

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_alb
 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);

Seems fine.

Quoted 1 line
	-J

---
-Jay Vosburgh, IBM Linux Technology Center, [email protected]