]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbe: cleanup feature flags in ixgbe_probe
authorDon Skidmore <donald.c.skidmore@intel.com>
Sat, 30 Jul 2011 05:08:18 +0000 (05:08 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 14:02:11 +0000 (22:02 +0800)
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>
drivers/net/ixgbe/ixgbe_main.c

index 442b2f7bcdda48da083d54b79a231b0ae94c525e..c334117b01539e117d1c3cd4d450211eca3bf782 100644 (file)
@@ -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;