]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
tg3: Disable TSS
authorMatt Carlson <mcarlson@broadcom.com>
Wed, 15 Sep 2010 08:59:54 +0000 (08:59 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Sep 2010 21:16:11 +0000 (14:16 -0700)
It was recently discovered that enabling TSS can lockup the device.
This patch disables the feature until a suitable workaround can be
found.

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

index c3a430cfbe002745521196f1c63a133d3a535d45..38f1b19b776b8734d51d54a961b4b15fa842bb5b 100644 (file)
@@ -8827,16 +8827,9 @@ static bool tg3_enable_msix(struct tg3 *tp)
                tp->napi[i].irq_vec = msix_ent[i].vector;
 
        tp->dev->real_num_tx_queues = 1;
-       if (tp->irq_cnt > 1) {
+       if (tp->irq_cnt > 1)
                tp->tg3_flags3 |= TG3_FLG3_ENABLE_RSS;
 
-               if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-                   GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
-                       tp->tg3_flags3 |= TG3_FLG3_ENABLE_TSS;
-                       tp->dev->real_num_tx_queues = tp->irq_cnt - 1;
-               }
-       }
-
        return true;
 }