[PATCH 2.6.21.3] bonding: Fix 802.3ad no carrier on "no partner found" instance

[PATCH 2.6.21.3] bonding: Fix 802.3ad no carrier on "no partner found" instance

[Laurent Chavey]

Remove the requirement to have at least one configured partner to
enable the operation of links. The later is necessary to have the code
in compliance with section 43.3.9 of IEEE 802.3,

Signed-off-by: Laurent Chavey <chavey@google.com>
--

diff -ru linux-2.6.21.3/drivers/net/bonding/bond_3ad.c
linux-2.6.21.3.new/drivers/net/bonding/bond_3ad.c
--- linux-2.6.21.3/drivers/net/bonding/bond_3ad.c       2007-05-24
14:22:47.000000000 -0700
+++ linux-2.6.21.3.new/drivers/net/bonding/bond_3ad.c   2007-06-01
12:41:57.000000000 -0700
@@ -2303,19 +2303,17 @@
 }

 /*
- * set link state for bonding master: if we have an active partnered
+ * set link state for bonding master: if we have an active
  * aggregator, we're up, if not, we're down.  Presumes that we cannot
  * have an active aggregator if there are no slaves with link up.
+ * Code is implementing compliance with section 43.3.9 of IEEE 802.3.
  *
  * Called by bond_set_carrier(). Return zero if carrier state does not
  * change, nonzero if it does.
  */
 int bond_3ad_set_carrier(struct bonding *bond)
 {
-       struct aggregator *agg;
-
-       agg = __get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator));
-       if (agg && MAC_ADDRESS_COMPARE(&agg->partner_system, &null_mac_addr)) {
+       if (__get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator))) {
                if (!netif_carrier_ok(bond->dev)) {
                        netif_carrier_on(bond->dev);
                        return 1;
@@ -2468,4 +2466,3 @@

        return ret;
 }
-

Re: [PATCH 2.6.21.3] bonding: Fix 802.3ad no carrier on "no partner found" instance

[Jay Vosburgh]

	Jeff, please apply wherever seems appropriate.  It is a bug fix,
but for a pretty obscure bit of standards compliance.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>

	-J


Laurent Chavey <chavey@google.com> wrote:

>Remove the requirement to have at least one configured partner to
>enable the operation of links. The later is necessary to have the code
>in compliance with section 43.3.9 of IEEE 802.3,
>
>Signed-off-by: Laurent Chavey <chavey@google.com>
>--
>
>diff -ru linux-2.6.21.3/drivers/net/bonding/bond_3ad.c
>linux-2.6.21.3.new/drivers/net/bonding/bond_3ad.c
>--- linux-2.6.21.3/drivers/net/bonding/bond_3ad.c       2007-05-24
>14:22:47.000000000 -0700
>+++ linux-2.6.21.3.new/drivers/net/bonding/bond_3ad.c   2007-06-01
>12:41:57.000000000 -0700
>@@ -2303,19 +2303,17 @@
>}
>
>/*
>- * set link state for bonding master: if we have an active partnered
>+ * set link state for bonding master: if we have an active
> * aggregator, we're up, if not, we're down.  Presumes that we cannot
> * have an active aggregator if there are no slaves with link up.
>+ * Code is implementing compliance with section 43.3.9 of IEEE 802.3.
> *
> * Called by bond_set_carrier(). Return zero if carrier state does not
> * change, nonzero if it does.
> */
>int bond_3ad_set_carrier(struct bonding *bond)
>{
>-       struct aggregator *agg;
>-
>-       agg = __get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator));
>-       if (agg && MAC_ADDRESS_COMPARE(&agg->partner_system, &null_mac_addr)) {
>+       if (__get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator))) {
>               if (!netif_carrier_ok(bond->dev)) {
>                       netif_carrier_on(bond->dev);
>                       return 1;
>@@ -2468,4 +2466,3 @@
>
>       return ret;
>}
>-
>-
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2.6.21.3] bonding: Fix 802.3ad no carrier on "no partner found" instance

[Jeff Garzik]

Laurent Chavey wrote:
> Remove the requirement to have at least one configured partner to
> enable the operation of links. The later is necessary to have the code
> in compliance with section 43.3.9 of IEEE 802.3,
> 
> Signed-off-by: Laurent Chavey <chavey@google.com>

Looks OK but patch is corrupted:

[jgarzik@pretzel netdev-2.6]$ git-am --signoff --utf8 /g/tmp/mbox

Applying 'bonding: Fix 802.3ad no carrier on "no partner found" instance'

fatal: patch fragment without header at line 7: @@ -2303,19 +2303,17 @@
Patch failed at 0001.
When you have resolved this problem run "git-am --resolved".
If you would prefer to skip this patch, instead run "git-am --skip".

[PATCH UPDATED] bonding: Fix 802.3ad no carrier on "no partner found" instance

[Jay Vosburgh]

	Modify carrier state determination for 802.3ad mode to comply
with section 43.3.9 of IEEE 802.3, which requires that "Links that are
not successful candidates for aggregation (e.g., links that are attached
to other devices that cannot perform aggregation or links that have been
manually configured to be non-aggregatable) are enabled to operate as
individual IEEE 802.3 links."

	Bug reported by Laurent Chavey <chavey@google.com>.  This patch
is an updated version of his patch that changes the wording of
commentary and adds an update to the driver version.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Laurent Chavey <chavey@google.com>


diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 7e03f41..f829e4a 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2303,19 +2303,18 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 }
 
 /*
- * set link state for bonding master: if we have an active partnered
+ * set link state for bonding master: if we have an active 
  * aggregator, we're up, if not, we're down.  Presumes that we cannot
  * have an active aggregator if there are no slaves with link up.
  *
+ * This behavior complies with IEEE 802.3 section 43.3.9.
+ *
  * Called by bond_set_carrier(). Return zero if carrier state does not
  * change, nonzero if it does.
  */
 int bond_3ad_set_carrier(struct bonding *bond)
 {
-	struct aggregator *agg;
-
-	agg = __get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator));
-	if (agg && MAC_ADDRESS_COMPARE(&agg->partner_system, &null_mac_addr)) {
+	if (__get_active_agg(&(SLAVE_AD_INFO(bond->first_slave).aggregator))) {
 		if (!netif_carrier_ok(bond->dev)) {
 			netif_carrier_on(bond->dev);
 			return 1;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 41aa78b..a891021 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION	"3.1.2"
-#define DRV_RELDATE	"January 20, 2007"
+#define DRV_VERSION	"3.1.3"
+#define DRV_RELDATE	"June 13, 2007"
 #define DRV_NAME	"bonding"
 #define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"
 

Re: [PATCH UPDATED] bonding: Fix 802.3ad no carrier on "no partner found" instance

[Jeff Garzik]

Jay Vosburgh wrote:
> 	Modify carrier state determination for 802.3ad mode to comply
> with section 43.3.9 of IEEE 802.3, which requires that "Links that are
> not successful candidates for aggregation (e.g., links that are attached
> to other devices that cannot perform aggregation or links that have been
> manually configured to be non-aggregatable) are enabled to operate as
> individual IEEE 802.3 links."
> 
> 	Bug reported by Laurent Chavey <chavey@google.com>.  This patch
> is an updated version of his patch that changes the wording of
> commentary and adds an update to the driver version.
> 
> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
> Signed-off-by: Laurent Chavey <chavey@google.com>

applied to #upstream-fixes