From patchwork Mon Mar 9 20:53:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Krogh X-Patchwork-Id: 24222 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4794FDDD1B for ; Tue, 10 Mar 2009 07:53:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbZCIUxw (ORCPT ); Mon, 9 Mar 2009 16:53:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751696AbZCIUxu (ORCPT ); Mon, 9 Mar 2009 16:53:50 -0400 Received: from 2605ds1-ynoe.1.fullrate.dk ([90.184.12.24]:34360 "EHLO shrek.krogh.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751414AbZCIUxt (ORCPT ); Mon, 9 Mar 2009 16:53:49 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by shrek.krogh.cc (Postfix) with ESMTP id 1E4033BF500; Mon, 9 Mar 2009 21:53:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at shrek.krogh.cc Received: from shrek.krogh.cc ([127.0.0.1]) by localhost (shrek.krogh.cc [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Itc5hgx7uBRw; Mon, 9 Mar 2009 21:53:36 +0100 (CET) Received: from [192.168.1.4] (unknown [90.184.13.46]) by shrek.krogh.cc (Postfix) with ESMTP id A83E93BED1E; Mon, 9 Mar 2009 21:53:33 +0100 (CET) Message-ID: <49B581D3.6060807@krogh.cc> Date: Mon, 09 Mar 2009 21:53:39 +0100 From: Jesper Krogh User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Jay Vosburgh CC: Linux Kernel Mailing List , "netdev@vger.kernel.org" , Jeff Garzik , aowi@novozymes.com Subject: Re: Regression in bonding between 2.6.26.8 and 2.6.27.6 - bisected - twice References: <491FEAD5.4090205@krogh.cc> <49A7B17F.2020408@krogh.cc> <16084.1235752119@death.nxdomain.ibm.com> <49A84802.7030502@krogh.cc> <30478.1235766943@death.nxdomain.ibm.com> <49AA2973.7040209@krogh.cc> <49AA8B4F.8090405@krogh.cc> <9712.1236279072@death.nxdomain.ibm.com> In-Reply-To: <9712.1236279072@death.nxdomain.ibm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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). #define BOND_FOM_FOLLOW 2 --- 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 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