Commit d542fe27 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller

tg3: Fix NETIF_F_LOOPBACK error

Mahesh Bandewar noticed that the features cleanup in commit
0da0606f, entitled
"tg3: Consolidate all netdev feature assignments", mistakenly sets
NETIF_F_LOOPBACK by default.  This patch corrects the error.
Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 449f4544
...@@ -15080,6 +15080,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, ...@@ -15080,6 +15080,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
features |= NETIF_F_TSO_ECN; features |= NETIF_F_TSO_ECN;
} }
dev->features |= features;
dev->vlan_features |= features;
/* /*
* Add loopback capability only for a subset of devices that support * Add loopback capability only for a subset of devices that support
* MAC-LOOPBACK. Eventually this need to be enhanced to allow INT-PHY * 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, ...@@ -15090,9 +15093,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
/* Add the loopback capability */ /* Add the loopback capability */
features |= NETIF_F_LOOPBACK; features |= NETIF_F_LOOPBACK;
dev->features |= features;
dev->hw_features |= features; dev->hw_features |= features;
dev->vlan_features |= features;
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 && if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 &&
!tg3_flag(tp, TSO_CAPABLE) && !tg3_flag(tp, TSO_CAPABLE) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment