redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

tg3: Fix NETIF_F_LOOPBACK error

Browse source 
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:
Matt Carlson 2011-05-19 16:02:43 +00:00 committed by David S. Miller
parent 449f454426
commit d542fe27c8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/tg3.c
View file

@ -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,
/* 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) &&