mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
tg3: Fix NETIF_F_LOOPBACK error
Mahesh Bandewar noticed that the features cleanup in commit
0da0606f49
, 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>
This commit is contained in:
parent
449f454426
commit
d542fe27c8
@ -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) &&
|
||||
|
Loading…
Reference in New Issue
Block a user