Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361435
b: refs/heads/master
c: 876254a
h: refs/heads/master
i:
  361433: 942078a
  361431: a22ab0f
v: v3
  • Loading branch information
Veaceslav Falico authored and David S. Miller committed Mar 13, 2013
1 parent 492c7cd commit f8e62a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d35162f89b8f00537d7b240b76d2d0e8b8d29aa0
refs/heads/master: 876254ae2758d50dcb08c7bd00caf6a806571178
6 changes: 2 additions & 4 deletions trunk/drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1746,6 +1746,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)

bond_compute_features(bond);

bond_update_speed_duplex(new_slave);

read_lock(&bond->lock);

new_slave->last_arp_rx = jiffies -
Expand Down Expand Up @@ -1798,8 +1800,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
new_slave->link == BOND_LINK_DOWN ? "DOWN" :
(new_slave->link == BOND_LINK_UP ? "UP" : "BACK"));

bond_update_speed_duplex(new_slave);

if (USES_PRIMARY(bond->params.mode) && bond->params.primary[0]) {
/* if there is a primary slave, remember it */
if (strcmp(bond->params.primary, new_slave->dev->name) == 0) {
Expand Down Expand Up @@ -2374,8 +2374,6 @@ static void bond_miimon_commit(struct bonding *bond)
bond_set_backup_slave(slave);
}

bond_update_speed_duplex(slave);

pr_info("%s: link status definitely up for interface %s, %u Mbps %s duplex.\n",
bond->dev->name, slave->dev->name,
slave->speed, slave->duplex ? "full" : "half");
Expand Down

0 comments on commit f8e62a7

Please sign in to comment.