From patchwork Wed Aug 31 15:00:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Schmidt X-Patchwork-Id: 112565 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 C0490B6F80 for ; Thu, 1 Sep 2011 01:01:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756185Ab1HaPAu (ORCPT ); Wed, 31 Aug 2011 11:00:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10436 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756191Ab1HaPAr (ORCPT ); Wed, 31 Aug 2011 11:00:47 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7VF0jlJ025463 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 31 Aug 2011 11:00:46 -0400 Received: from dhcp-29-224.brq.redhat.com (dhcp-26-161.brq.redhat.com [10.34.26.161]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7VF0dP8014091; Wed, 31 Aug 2011 11:00:44 -0400 From: Michal Schmidt To: netdev@vger.kernel.org Cc: vladz@broadcom.com, dmitry@broadcom.com, eilong@broadcom.com, mirqus@gmail.com Subject: [PATCH 2/3] bnx2x: do not set NETIF_F_LRO in bnx2x_init_bp Date: Wed, 31 Aug 2011 17:00:35 +0200 Message-Id: <1314802836-9862-3-git-send-email-mschmidt@redhat.com> In-Reply-To: <1314802836-9862-1-git-send-email-mschmidt@redhat.com> References: <1314802836-9862-1-git-send-email-mschmidt@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org bnx2x_fix_features() will take care of clearing NETIF_F_LRO if 'disable_tpa' is used. Signed-off-by: Michal Schmidt --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index fd32c04..c1285db 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -9755,12 +9755,6 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp) "must load devices in order!\n"); bp->multi_mode = multi_mode; - - /* Set TPA flags */ - if (disable_tpa) - bp->dev->features &= ~NETIF_F_LRO; - else - bp->dev->features |= NETIF_F_LRO; bp->disable_tpa = disable_tpa; if (CHIP_IS_E1(bp))