From 7c6bddf10f487159b304547b1af573d418aeca74 Mon Sep 17 00:00:00 2001 From: Mitch Williams Date: Wed, 9 Nov 2005 10:36:50 -0800 Subject: [PATCH] --- yaml --- r: 15723 b: refs/heads/master c: e944ef79184ff7f283e7bf79496d2873a0b0410b h: refs/heads/master i: 15721: 755fa46e6ee3c8d82691d2c5ac7ea8180ca8051c 15719: 8add5c46a19b689c8fa1811152cd40f3478ad8c4 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_alb.c | 2 +- trunk/drivers/net/bonding/bond_main.c | 1 + trunk/drivers/net/bonding/bonding.h | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3395dc8c8cd7..c61ee3172e39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39755cad88f7b26dcb1edf9dcf14bd85f8fc2a3a +refs/heads/master: e944ef79184ff7f283e7bf79496d2873a0b0410b diff --git a/trunk/drivers/net/bonding/bond_alb.c b/trunk/drivers/net/bonding/bond_alb.c index 24f4a3d14991..9bd1e104554a 100644 --- a/trunk/drivers/net/bonding/bond_alb.c +++ b/trunk/drivers/net/bonding/bond_alb.c @@ -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); diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 5ac9718c5988..c7cd6b96d2c0 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -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) { diff --git a/trunk/drivers/net/bonding/bonding.h b/trunk/drivers/net/bonding/bonding.h index 88b8981d24b0..ef4b11c4006e 100644 --- a/trunk/drivers/net/bonding/bonding.h +++ b/trunk/drivers/net/bonding/bonding.h @@ -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; @@ -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;