From patchwork Mon Aug 29 08:41:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 111985 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 49022B6F8C for ; Mon, 29 Aug 2011 18:41:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349Ab1H2Ila (ORCPT ); Mon, 29 Aug 2011 04:41:30 -0400 Received: from mga02.intel.com ([134.134.136.20]:36890 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753340Ab1H2IlR (ORCPT ); Mon, 29 Aug 2011 04:41:17 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 29 Aug 2011 01:41:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="43191691" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.15.8]) by orsmga001.jf.intel.com with ESMTP; 29 Aug 2011 01:41:15 -0700 From: Jeff Kirsher To: davem@davemloft.net Cc: Don Skidmore , netdev@vger.kernel.org, gospo@redhat.com, Jeff Kirsher Subject: [net-next 07/10] ixgbe: cleanup feature flags in ixgbe_probe Date: Mon, 29 Aug 2011 01:41:05 -0700 Message-Id: <1314607268-26958-8-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1314607268-26958-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1314607268-26958-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Don Skidmore I'm removing NETIF_F_GRO from being initialed in the feature flags during ixgbe_probe() bases on a comment from Michal Miroslaw that it is always set by network code now. Signed-off-by: Don Skidmore Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 3932cd0..a30f826 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7510,7 +7510,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, NETIF_F_HW_VLAN_FILTER | NETIF_F_TSO | NETIF_F_TSO6 | - NETIF_F_GRO | NETIF_F_RXHASH | NETIF_F_RXCSUM;