diff options
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 21bce2c0fde2..d7695d43158b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -1002,6 +1002,10 @@ static void bond_mc_swap(struct bonding *bond, struct slave *new_active, struct | |||
1002 | static void bond_do_fail_over_mac(struct bonding *bond, | 1002 | static void bond_do_fail_over_mac(struct bonding *bond, |
1003 | struct slave *new_active, | 1003 | struct slave *new_active, |
1004 | struct slave *old_active) | 1004 | struct slave *old_active) |
1005 | __releases(&bond->curr_slave_lock) | ||
1006 | __releases(&bond->lock) | ||
1007 | __acquires(&bond->lock) | ||
1008 | __acquires(&bond->curr_slave_lock) | ||
1005 | { | 1009 | { |
1006 | u8 tmp_mac[ETH_ALEN]; | 1010 | u8 tmp_mac[ETH_ALEN]; |
1007 | struct sockaddr saddr; | 1011 | struct sockaddr saddr; |
@@ -3193,6 +3197,8 @@ out: | |||
3193 | #ifdef CONFIG_PROC_FS | 3197 | #ifdef CONFIG_PROC_FS |
3194 | 3198 | ||
3195 | static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) | 3199 | static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) |
3200 | __acquires(&dev_base_lock) | ||
3201 | __acquires(&bond->lock) | ||
3196 | { | 3202 | { |
3197 | struct bonding *bond = seq->private; | 3203 | struct bonding *bond = seq->private; |
3198 | loff_t off = 0; | 3204 | loff_t off = 0; |
@@ -3232,6 +3238,8 @@ static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
3232 | } | 3238 | } |
3233 | 3239 | ||
3234 | static void bond_info_seq_stop(struct seq_file *seq, void *v) | 3240 | static void bond_info_seq_stop(struct seq_file *seq, void *v) |
3241 | __releases(&bond->lock) | ||
3242 | __releases(&dev_base_lock) | ||
3235 | { | 3243 | { |
3236 | struct bonding *bond = seq->private; | 3244 | struct bonding *bond = seq->private; |
3237 | 3245 | ||