From patchwork Wed Nov 21 11:10:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarveshwar Bandi X-Patchwork-Id: 200646 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.180.67]) by ozlabs.org (Postfix) with ESMTP id EB6872C0098 for ; Wed, 21 Nov 2012 22:10:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754077Ab2KULKH (ORCPT ); Wed, 21 Nov 2012 06:10:07 -0500 Received: from cmexedge1.ext.emulex.com ([138.239.224.99]:45781 "EHLO CMEXEDGE1.ext.emulex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753387Ab2KULKG convert rfc822-to-8bit (ORCPT ); Wed, 21 Nov 2012 06:10:06 -0500 Received: from CMEXHTCAS1.ad.emulex.com (138.239.115.217) by CMEXEDGE1.ext.emulex.com (138.239.224.99) with Microsoft SMTP Server (TLS) id 14.2.318.4; Wed, 21 Nov 2012 03:10:11 -0800 Received: from CMEXMB1.ad.emulex.com ([169.254.1.23]) by CMEXHTCAS1.ad.emulex.com ([2002:8aef:73d9::8aef:73d9]) with mapi id 14.02.0318.004; Wed, 21 Nov 2012 03:10:04 -0800 From: "Bandi,Sarveshwar" To: "Bandi,Sarveshwar" , "davem@davemloft.net" CC: "netdev@vger.kernel.org" Subject: RE: [PATCH net-2.6] be2net: Bonding driver does not considerthe gso_max_size setting of slaves. Thread-Topic: [PATCH net-2.6] be2net: Bonding driver does not considerthe gso_max_size setting of slaves. Thread-Index: AQHNx9hq0fjXVT5/Lk+UD9Ft12LAppf0IbUQ Date: Wed, 21 Nov 2012 11:10:04 +0000 Message-ID: <044b44bc-8768-49af-ae2a-5227b09b73d9@CMEXHTCAS1.ad.emulex.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [138.239.142.143] MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Please ignore this patch. It is meant for bonding driver. Will resend patch. -----Original Message----- From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On Behalf Of sarveshwar.bandi@emulex.com Sent: Wednesday, November 21, 2012 4:38 PM To: davem@davemloft.net Cc: netdev@vger.kernel.org; Bandi,Sarveshwar Subject: [PATCH net-2.6] be2net: Bonding driver does not considerthe gso_max_size setting of slaves. From: Sarveshwar Bandi Patch sets the lowest non-zero gso_max_size value of the slaves during enslave and detach. Signed-off-by: Sarveshwar Bandi --- drivers/net/bonding/bond_main.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) bond_dev->priv_flags = flags | dst_release_flag; + bond_set_gso_max_size(bond); + read_unlock(&bond->lock); netdev_change_features(bond_dev); -- 1.7.9.5 -- 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 -- 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 b2530b0..5f19d16 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1198,6 +1198,31 @@ static void bond_attach_slave(struct bonding *bond, struct slave *new_slave) bond->slave_cnt++; } +static void bond_set_gso_max_size(struct bonding *bond) { + struct slave *slave; + struct net_device *bond_dev = bond->dev; + unsigned int gso_max_size = 0; + bool reset_gso_size = true; + int i; + + bond_for_each_slave(bond, slave, i) { + if (!slave->dev->gso_max_size) + continue; + + reset_gso_size = false; + + if (!gso_max_size || + slave->dev->gso_max_size < gso_max_size) + gso_max_size = slave->dev->gso_max_size; + } + + if (gso_max_size && gso_max_size < bond_dev->gso_max_size) + netif_set_gso_max_size(bond_dev, gso_max_size); + else if (reset_gso_size) + netif_set_gso_max_size(bond_dev, 0); +} + /* * This function detaches the slave from the list. * WARNING: no check is made to verify if the slave effectively @@ -1403,6 +1428,8 @@ done: flags = bond_dev->priv_flags & ~IFF_XMIT_DST_RELEASE;