From 28ce22c8619e065e2e1eaf3035bfb9fea95a688d Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 15 Sep 2010 08:59:57 +0000 Subject: [PATCH] --- yaml --- r: 214527 b: refs/heads/master c: 6fd45cb814709767a1704b541aa91647b7f275cf h: refs/heads/master i: 214525: f8c843a55bcccb1aa89180a370fdd9fd0d622eca 214523: 4c3a7fca0337f7588d61259307e6851c708ece7a 214519: b469dde7cb0005dc48d792c45667d7be4b9778fb 214511: 25bf6da45c4ed95d4e8ecb0c4fce9bbcd78191ad 214495: a2438357472a23344db76a7c2c0d64b990dc28ae 214463: fc850d6e81fe0390a68295b989e1d8dc020bcd42 214399: 417877e4898504a35c380b6b6c33bd39870f9d0b 214271: c03747311e2bf6d23de11c097076cb92fad831da 214015: def81511de116cea01768ab70f3be63eec5978f8 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 6 +++--- trunk/drivers/net/tg3.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 985211d8dbcc..49cda86cf931 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e9f7a7408d264f01d4477c564ef5c6b610cd10f +refs/heads/master: 6fd45cb814709767a1704b541aa91647b7f275cf diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 4e92b81bccfa..7468479902ae 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -7564,7 +7564,7 @@ static void tg3_rings_reset(struct tg3 *tp) /* Zero mailbox registers. */ if (tp->tg3_flags & TG3_FLAG_SUPPORT_MSIX) { - for (i = 1; i < TG3_IRQ_MAX_VECS; i++) { + for (i = 1; i < tp->irq_max; i++) { tp->napi[i].tx_prod = 0; tp->napi[i].tx_cons = 0; if (tp->tg3_flags3 & TG3_FLG3_ENABLE_TSS) @@ -9886,7 +9886,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e tp->rx_pending = 63; tp->rx_jumbo_pending = ering->rx_jumbo_pending; - for (i = 0; i < TG3_IRQ_MAX_VECS; i++) + for (i = 0; i < tp->irq_max; i++) tp->napi[i].tx_pending = ering->tx_pending; if (netif_running(dev)) { @@ -14598,7 +14598,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, intmbx = MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW; rcvmbx = MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW; sndmbx = MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW; - for (i = 0; i < TG3_IRQ_MAX_VECS; i++) { + for (i = 0; i < tp->irq_max; i++) { struct tg3_napi *tnapi = &tp->napi[i]; tnapi->tp = tp; diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index 5cd0653d6caf..d39426fc8a6e 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -2659,7 +2659,8 @@ struct tg3_rx_prodring_set { dma_addr_t rx_jmb_mapping; }; -#define TG3_IRQ_MAX_VECS 5 +#define TG3_IRQ_MAX_VECS_RSS 5 +#define TG3_IRQ_MAX_VECS TG3_IRQ_MAX_VECS_RSS struct tg3_napi { struct napi_struct napi ____cacheline_aligned;