]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
tg3: Disable TSS also during tg3_close()
authorMatt Carlson <mcarlson@broadcom.com>
Mon, 2 Aug 2010 11:25:56 +0000 (11:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Aug 2010 22:46:27 +0000 (15:46 -0700)
The TSS flag needs to be turned off during tg3_close().  If the device
fails to allocate more than one MSI-X vector the next time the device is
brought up, transmits will fail.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tg3.c

index 98ca0d20d20662f379d5cd5e7cf70fb8f360c044..12a2dd77c367bcb3cea6206b1b6f74a5436e5925 100644 (file)
@@ -8864,7 +8864,7 @@ static void tg3_ints_fini(struct tg3 *tp)
        else if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
                pci_disable_msi(tp->pdev);
        tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI_OR_MSIX;
-       tp->tg3_flags3 &= ~TG3_FLG3_ENABLE_RSS;
+       tp->tg3_flags3 &= ~(TG3_FLG3_ENABLE_RSS | TG3_FLG3_ENABLE_TSS);
 }
 
 static int tg3_open(struct net_device *dev)