aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-12-30 13:43:41 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-01 23:43:36 -0500
commit6da67d260873e157a8df28bc8b1b10d8e0cab099 (patch)
treee2659629c0710dacbf421b421ad658d1772d9c4b
parent3678a9d86324e457d0ff9d898747ee7e787f4bb8 (diff)
bonding: make more functions static
More functions in bonding that can be declared static because they are only used in one file. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c6
-rw-r--r--drivers/net/bonding/bonding.h3
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 69525942658d..11bedbaf37db 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2088,7 +2088,7 @@ do_failover:
2088 * an acquisition of appropriate locks followed by a commit phase to 2088 * an acquisition of appropriate locks followed by a commit phase to
2089 * implement whatever link state changes are indicated. 2089 * implement whatever link state changes are indicated.
2090 */ 2090 */
2091void bond_mii_monitor(struct work_struct *work) 2091static void bond_mii_monitor(struct work_struct *work)
2092{ 2092{
2093 struct bonding *bond = container_of(work, struct bonding, 2093 struct bonding *bond = container_of(work, struct bonding,
2094 mii_work.work); 2094 mii_work.work);
@@ -2377,7 +2377,7 @@ static bool bond_time_in_interval(struct bonding *bond, unsigned long last_act,
2377 * arp is transmitted to generate traffic. see activebackup_arp_monitor for 2377 * arp is transmitted to generate traffic. see activebackup_arp_monitor for
2378 * arp monitoring in active backup mode. 2378 * arp monitoring in active backup mode.
2379 */ 2379 */
2380void bond_loadbalance_arp_mon(struct work_struct *work) 2380static void bond_loadbalance_arp_mon(struct work_struct *work)
2381{ 2381{
2382 struct bonding *bond = container_of(work, struct bonding, 2382 struct bonding *bond = container_of(work, struct bonding,
2383 arp_work.work); 2383 arp_work.work);
@@ -2714,7 +2714,7 @@ static void bond_ab_arp_probe(struct bonding *bond)
2714 rcu_assign_pointer(bond->current_arp_slave, new_slave); 2714 rcu_assign_pointer(bond->current_arp_slave, new_slave);
2715} 2715}
2716 2716
2717void bond_activebackup_arp_mon(struct work_struct *work) 2717static void bond_activebackup_arp_mon(struct work_struct *work)
2718{ 2718{
2719 struct bonding *bond = container_of(work, struct bonding, 2719 struct bonding *bond = container_of(work, struct bonding,
2720 arp_work.work); 2720 arp_work.work);
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index e39d47725b4a..8e8817f3ef31 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -423,9 +423,6 @@ void bond_destroy_sysfs(struct bond_net *net);
423void bond_prepare_sysfs_group(struct bonding *bond); 423void bond_prepare_sysfs_group(struct bonding *bond);
424int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev); 424int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);
425int bond_release(struct net_device *bond_dev, struct net_device *slave_dev); 425int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);
426void bond_mii_monitor(struct work_struct *);
427void bond_loadbalance_arp_mon(struct work_struct *);
428void bond_activebackup_arp_mon(struct work_struct *);
429int bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, int count); 426int bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, int count);
430int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl); 427int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl);
431void bond_select_active_slave(struct bonding *bond); 428void bond_select_active_slave(struct bonding *bond);