From f36ec91ff61a1e99cd08288826766db4834cb202 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 15 Sep 2010 08:59:54 +0000 Subject: [PATCH] --- yaml --- r: 214524 b: refs/heads/master c: f0392d24485e4c144d2741a5424f069b8b5f30e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ab2c606d052e..484cf27d2d7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41a8a7ee4a78216962f3afcea5968c04d0ab3b08 +refs/heads/master: f0392d24485e4c144d2741a5424f069b8b5f30e7 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index c3a430cfbe00..38f1b19b776b 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -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; }