diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2011-05-19 18:02:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 06:33:18 +0200 |
| commit | d542fe27c86ecf932f40c898881208ccdaef9dc5 (patch) | |
| tree | 8ee74f4e1e4c4a9f279939d2fa528a557e7458af /drivers | |
| parent | macvlan: remove one synchronize_rcu() call (diff) | |
| download | linux-d542fe27c86ecf932f40c898881208ccdaef9dc5.tar.xz linux-d542fe27c86ecf932f40c898881208ccdaef9dc5.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/tg3.c | 5 |
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) && |