summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-05-19 20:02:43 +0400
committerDavid S. Miller <davem@davemloft.net>2011-05-20 08:33:18 +0400
commitd542fe27c86ecf932f40c898881208ccdaef9dc5 (patch)
tree8ee74f4e1e4c4a9f279939d2fa528a557e7458af
parent449f4544267e73d5db372971da63634707c32299 (diff)
downloadlinux-d542fe27c86ecf932f40c898881208ccdaef9dc5.tar.xz
tg3: Fix NETIF_F_LOOPBACK error
Mahesh Bandewar noticed that the features cleanup in commit 0da0606f493c5cdab74bdcc96b12f4305ad94085, entitled "tg3: Consolidate all netdev feature assignments", mistakenly sets NETIF_F_LOOPBACK by default. This patch corrects the error. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Mahesh Bandewar <maheshb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 012ce70aeaf5..284e99853ed3 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -15080,6 +15080,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
features |= NETIF_F_TSO_ECN;
}
+ dev->features |= features;
+ dev->vlan_features |= features;
+
/*
* Add loopback capability only for a subset of devices that support
* MAC-LOOPBACK. Eventually this need to be enhanced to allow INT-PHY
@@ -15090,9 +15093,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
/* Add the loopback capability */
features |= NETIF_F_LOOPBACK;
- dev->features |= features;
dev->hw_features |= features;
- dev->vlan_features |= features;
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 &&
!tg3_flag(tp, TSO_CAPABLE) &&