diff options
-rw-r--r-- | drivers/net/bonding/bond_main.c | 6 | ||||
-rw-r--r-- | drivers/net/bonding/bonding.h | 3 |
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 | */ |
2091 | void bond_mii_monitor(struct work_struct *work) | 2091 | static 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 | */ |
2380 | void bond_loadbalance_arp_mon(struct work_struct *work) | 2380 | static 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 | ||
2717 | void bond_activebackup_arp_mon(struct work_struct *work) | 2717 | static 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); | |||
423 | void bond_prepare_sysfs_group(struct bonding *bond); | 423 | void bond_prepare_sysfs_group(struct bonding *bond); |
424 | int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev); | 424 | int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev); |
425 | int bond_release(struct net_device *bond_dev, struct net_device *slave_dev); | 425 | int bond_release(struct net_device *bond_dev, struct net_device *slave_dev); |
426 | void bond_mii_monitor(struct work_struct *); | ||
427 | void bond_loadbalance_arp_mon(struct work_struct *); | ||
428 | void bond_activebackup_arp_mon(struct work_struct *); | ||
429 | int bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, int count); | 426 | int bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, int count); |
430 | int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl); | 427 | int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl); |
431 | void bond_select_active_slave(struct bonding *bond); | 428 | void bond_select_active_slave(struct bonding *bond); |