aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_alb.c2
-rw-r--r--drivers/net/bonding/bond_main.c1
-rw-r--r--drivers/net/bonding/bonding.h4
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 24f4a3d14991..9bd1e104554a 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1417,7 +1417,7 @@ void bond_alb_monitor(struct bonding *bond)
1417 read_lock(&bond->curr_slave_lock); 1417 read_lock(&bond->curr_slave_lock);
1418 1418
1419 bond_for_each_slave(bond, slave, i) { 1419 bond_for_each_slave(bond, slave, i) {
1420 alb_send_learning_packets(slave,slave->dev->dev_addr); 1420 alb_send_learning_packets(slave, slave->dev->dev_addr);
1421 } 1421 }
1422 1422
1423 read_unlock(&bond->curr_slave_lock); 1423 read_unlock(&bond->curr_slave_lock);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5ac9718c5988..c7cd6b96d2c0 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4125,6 +4125,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
4125 bond_for_each_slave(bond, slave, i) { 4125 bond_for_each_slave(bond, slave, i) {
4126 dprintk("s %p s->p %p c_m %p\n", slave, 4126 dprintk("s %p s->p %p c_m %p\n", slave,
4127 slave->prev, slave->dev->change_mtu); 4127 slave->prev, slave->dev->change_mtu);
4128
4128 res = dev_set_mtu(slave->dev, new_mtu); 4129 res = dev_set_mtu(slave->dev, new_mtu);
4129 4130
4130 if (res) { 4131 if (res) {
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 88b8981d24b0..ef4b11c4006e 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -165,7 +165,7 @@ struct vlan_entry {
165}; 165};
166 166
167struct slave { 167struct slave {
168 struct net_device *dev; /* first - usefull for panic debug */ 168 struct net_device *dev; /* first - useful for panic debug */
169 struct slave *next; 169 struct slave *next;
170 struct slave *prev; 170 struct slave *prev;
171 s16 delay; 171 s16 delay;
@@ -191,7 +191,7 @@ struct slave {
191 * beforehand. 191 * beforehand.
192 */ 192 */
193struct bonding { 193struct bonding {
194 struct net_device *dev; /* first - usefull for panic debug */ 194 struct net_device *dev; /* first - useful for panic debug */
195 struct slave *first_slave; 195 struct slave *first_slave;
196 struct slave *curr_active_slave; 196 struct slave *curr_active_slave;
197 struct slave *current_arp_slave; 197 struct slave *current_arp_slave;