From patchwork Wed Nov 21 11:07:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarveshwar Bandi X-Patchwork-Id: 200645 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 EFABB2C008C for ; Wed, 21 Nov 2012 22:07:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754163Ab2KULHc (ORCPT ); Wed, 21 Nov 2012 06:07:32 -0500 Received: from cmexedge2.ext.emulex.com ([138.239.224.100]:9315 "EHLO CMEXEDGE2.ext.emulex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826Ab2KULHb (ORCPT ); Wed, 21 Nov 2012 06:07:31 -0500 Received: from CMEXHTCAS2.ad.emulex.com (138.239.115.218) by CMEXEDGE2.ext.emulex.com (138.239.224.100) with Microsoft SMTP Server (TLS) id 14.2.318.4; Wed, 21 Nov 2012 03:07:36 -0800 Received: from sbandi.hylab.emulex.com (10.192.224.107) by smtp.emulex.com (138.239.115.208) with Microsoft SMTP Server id 14.2.318.4; Wed, 21 Nov 2012 03:07:28 -0800 From: To: CC: , Sarveshwar Bandi Subject: [PATCH net-2.6] be2net: Bonding driver does not considerthe gso_max_size setting of slaves. Date: Wed, 21 Nov 2012 16:37:43 +0530 X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Message-ID: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(+) 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; bond_dev->priv_flags = flags | dst_release_flag; + bond_set_gso_max_size(bond); + read_unlock(&bond->lock); netdev_change_features(bond_dev);