From patchwork Thu Oct 4 18:14:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 189237 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 AF7F62C0079 for ; Fri, 5 Oct 2012 04:17:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754945Ab2JDSPN (ORCPT ); Thu, 4 Oct 2012 14:15:13 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:54728 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753730Ab2JDSPE (ORCPT ); Thu, 4 Oct 2012 14:15:04 -0400 Received: by mail-we0-f174.google.com with SMTP id t9so510525wey.19 for ; Thu, 04 Oct 2012 11:15:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=hlh251N1bTeSv7BTdUwoegJraZf3zeE9e1U+VHhr9KI=; b=igrBxsSscyzAumqEgv9R8jKGHXwTpjHcJDRSzvkI52u8S6fqmyUYXagNUfYhpES7tr mFYGcPfvP7CywzjtiTEjqlXFWp2AiyIxZzs7bt6TV8gyfbjXtyijV7BCvRwLyhqynIj/ EVHHSp/hnjYmMnWJHuhIicyGSreuKuGXnUvcWHvwFmQJYLEtdmPz7bI15zMi0Uw7JAGu 6V0FAllMSOFhZOuo45wt9hNz7/sIN77cZ966CpyuLmNsfYy2Doddyu78BnFaXlc4xI3H 4w3BVkHKONx8+GogIzcBqLWFYJOx6NoqzD+DisZ2rCptpEG9Cxkwb98VGnyRs6bGfdpm PKEw== Received: by 10.217.2.146 with SMTP id p18mr3961923wes.224.1349374502748; Thu, 04 Oct 2012 11:15:02 -0700 (PDT) Received: from localhost (nat-2.starnet.cz. [92.62.224.2]) by mx.google.com with ESMTPS id b7sm33575962wiz.3.2012.10.04.11.15.02 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 11:15:02 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Michal Simek , Anirudha Sarangi , John Linn , Grant Likely , Rob Herring , "David S. Miller" Subject: [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Date: Thu, 4 Oct 2012 20:14:47 +0200 Message-Id: <1349374497-9540-1-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 X-Gm-Message-State: ALoCoQlDlhxuC5vNdmQyejoH5vfxq85vjGbwaUydyQP1JXOkM27cCnT7Wry9gpmT17tbo4xiBWG3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Warning message: eth0: Dropping NETIF_F_SG since no checksum feature. Signed-off-by: Michal Simek CC: Anirudha Sarangi CC: John Linn CC: Grant Likely CC: Rob Herring CC: David S. Miller --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 0793299..50167ab 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -1494,7 +1494,7 @@ static int __devinit axienet_of_probe(struct platform_device *op) SET_NETDEV_DEV(ndev, &op->dev); ndev->flags &= ~IFF_MULTICAST; /* clear multicast */ - ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST; + ndev->features = NETIF_F_FRAGLIST; ndev->netdev_ops = &axienet_netdev_ops; ndev->ethtool_ops = &axienet_ethtool_ops; @@ -1519,14 +1519,14 @@ static int __devinit axienet_of_probe(struct platform_device *op) XAE_FEATURE_PARTIAL_TX_CSUM; lp->features |= XAE_FEATURE_PARTIAL_TX_CSUM; /* Can checksum TCP/UDP over IPv4. */ - ndev->features |= NETIF_F_IP_CSUM; + ndev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; break; case 2: lp->csum_offload_on_tx_path = XAE_FEATURE_FULL_TX_CSUM; lp->features |= XAE_FEATURE_FULL_TX_CSUM; /* Can checksum TCP/UDP over IPv4. */ - ndev->features |= NETIF_F_IP_CSUM; + ndev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; break; default: lp->csum_offload_on_tx_path = XAE_NO_CSUM_OFFLOAD;