Thread (23 messages) 23 messages, 4 authors, 2009-03-19

Re: Regression in bonding between 2.6.26.8 and 2.6.27.6 - bisected - twice

From: Jesper Krogh <hidden>
Date: 2009-03-09 20:54:04
Also in: lkml
Subsystem: bonding driver, networking drivers, the rest · Maintainers: Jay Vosburgh, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Jay Vosburgh wrote:
	However, I did find another bug I introduced during the "mii
refactor" patch that you mentioned as being the original source of the
problem.  That bug will cause 802.3ad to not notice speed changes.

	Could you test the patch below on your 2.6.68.7 and/or 2.6.27.19
and see if it resolves your problem (without the forcedeth patch)?
There was something missing from the header to make it compile.. I found 
that in a later version. Patch below fixed the problem (without the 
forcedeth patch).
diff --git a/drivers/net/bonding/bond_main.c 
b/drivers/net/bonding/bond_main.c
index 1b9c4dc..fd61dfb 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3516,11 +3516,27 @@ static int bond_slave_netdev_event(unsigned long 
event, struct net_device *slave
                 }
                 break;
         case NETDEV_CHANGE:
-               /*
-                * TODO: is this what we get if somebody
-                * sets up a hierarchical bond, then rmmod's
-                * one of the slave bonding devices?
-                */
+               if (bond->params.mode == BOND_MODE_8023AD ||
+                   bond_is_lb(bond)) {
+                       struct slave *slave;
+
+                       slave = bond_get_slave_by_dev(bond, slave_dev);
+                       if (slave) {
+                               u16 old_speed = slave->speed;
+                               u16 old_duplex = slave->duplex;
+
+                               bond_update_speed_duplex(slave);
+
+                               if (bond_is_lb(bond))
+                                       break;
+
+                               if (old_speed != slave->speed)
+ 
bond_3ad_adapter_speed_changed(slave);
+                               if (old_duplex != slave->duplex)
+ 
bond_3ad_adapter_duplex_changed(slave);
+                       }
+               }
+
                 break;
         case NETDEV_DOWN:
                 /*
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index fb730ec..b1315e4 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -248,6 +248,14 @@ static inline struct bonding 
*bond_get_bond_by_slave(struct slave *slave)
         return (struct bonding *)slave->dev->master->priv;
  }

+static inline bool bond_is_lb(const struct bonding *bond)
+{
+        return bond->params.mode == BOND_MODE_TLB
+                || bond->params.mode == BOND_MODE_ALB;
+}
+
+
+
  #define BOND_FOM_NONE                  0
  #define BOND_FOM_ACTIVE                        1
  #define BOND_FOM_FOLLOW                        2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help