From patchwork Tue Jun 29 14:37:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 57276 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 86010B6EEE for ; Wed, 30 Jun 2010 00:37:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756196Ab0F2Ohn (ORCPT ); Tue, 29 Jun 2010 10:37:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5289 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756151Ab0F2Ohm (ORCPT ); Tue, 29 Jun 2010 10:37:42 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5TEbZpm010398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Jun 2010 10:37:36 -0400 Received: from dhcp-lab-109.englab.brq.redhat.com (dhcp-27-239.brq.redhat.com [10.34.27.239]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5TEbY2H030464; Tue, 29 Jun 2010 10:37:34 -0400 Date: Tue, 29 Jun 2010 16:37:31 +0200 From: Stanislaw Gruszka To: netdev@vger.kernel.org Cc: Amerigo Wang , Andrew Gallatin , Brice Goglin Subject: [PATCH -next] myri10ge: clear NETIF_F_LRO bit directly Message-ID: <20100629163731.1d174b07@dhcp-lab-109.englab.brq.redhat.com> Organization: RedHat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not use ethtool_op_set_flags() to clear one bit in ->features. Inform user about disabling LRO. Signed-off-by: Stanislaw Gruszka Acked-by: Andrew J. Gallatin --- drivers/net/myri10ge/myri10ge.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index e0b47cc..2259168 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -1725,17 +1725,15 @@ static u32 myri10ge_get_rx_csum(struct net_device *netdev) static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled) { struct myri10ge_priv *mgp = netdev_priv(netdev); - int err = 0; if (csum_enabled) mgp->csum_flag = MXGEFW_FLAGS_CKSUM; else { - u32 flags = ethtool_op_get_flags(netdev); - err = ethtool_op_set_flags(netdev, (flags & ~ETH_FLAG_LRO)); mgp->csum_flag = 0; - + netdev->features &= ~NETIF_F_LRO; + netdev_info(netdev, "RX checksumming set off, disabling LRO\n"); } - return err; + return 0; } static int myri10ge_set_tso(struct net_device *netdev, u32 tso_enabled)