From d6662ffe3cefa0db32f8b8a11251c47f04003e93 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Thu, 19 May 2011 16:02:43 +0000 Subject: [PATCH] --- yaml --- r: 247746 b: refs/heads/master c: d542fe27c86ecf932f40c898881208ccdaef9dc5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9d71b518b9bb..2eb9ed0e92b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 449f4544267e73d5db372971da63634707c32299 +refs/heads/master: d542fe27c86ecf932f40c898881208ccdaef9dc5 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 012ce70aeaf5..284e99853ed3 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/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) &&