From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Sat, 30 Jul 2011 05:08:18 +0000 (+0000)
Subject: ixgbe: cleanup feature flags in ixgbe_probe
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~204
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1e26c0485e12cd94a13e8dc737a739929de67e14;p=users%2Fjedix%2Flinux-maple.git

ixgbe: cleanup feature flags in ixgbe_probe

I'm removing NETIF_F_GRO from being initialed in the feature flags during
ixgbe_probe() bases on a comment from Michal Miroslaw
<mirq-linux@rere.qmqm.pl> that it is always set by network code now.

(cherry picked from commit 6a864abbcea970de2ac3afaf530c44548e9d42a0)
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 442b2f7bcdda..c334117b0153 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -7509,7 +7509,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;