Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 15723
b: refs/heads/master
c: e944ef7
h: refs/heads/master
i:
  15721: 755fa46
  15719: 8add5c4
v: v3
  • Loading branch information
Mitch Williams authored and John W. Linville committed Nov 13, 2005
1 parent 7ecf010 commit 7c6bddf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 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: 39755cad88f7b26dcb1edf9dcf14bd85f8fc2a3a
refs/heads/master: e944ef79184ff7f283e7bf79496d2873a0b0410b
2 changes: 1 addition & 1 deletion trunk/drivers/net/bonding/bond_alb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@ void bond_alb_monitor(struct bonding *bond)
read_lock(&bond->curr_slave_lock);

bond_for_each_slave(bond, slave, i) {
alb_send_learning_packets(slave,slave->dev->dev_addr);
alb_send_learning_packets(slave, slave->dev->dev_addr);
}

read_unlock(&bond->curr_slave_lock);
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4125,6 +4125,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
bond_for_each_slave(bond, slave, i) {
dprintk("s %p s->p %p c_m %p\n", slave,
slave->prev, slave->dev->change_mtu);

res = dev_set_mtu(slave->dev, new_mtu);

if (res) {
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/bonding/bonding.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ struct vlan_entry {
};

struct slave {
struct net_device *dev; /* first - usefull for panic debug */
struct net_device *dev; /* first - useful for panic debug */
struct slave *next;
struct slave *prev;
s16 delay;
Expand All @@ -191,7 +191,7 @@ struct slave {
* beforehand.
*/
struct bonding {
struct net_device *dev; /* first - usefull for panic debug */
struct net_device *dev; /* first - useful for panic debug */
struct slave *first_slave;
struct slave *curr_active_slave;
struct slave *current_arp_slave;
Expand Down

0 comments on commit 7c6bddf

Please sign in to comment.