aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/falcon.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-09-01 07:47:48 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-09-03 09:53:46 -0400
commit8831da7b6c4b15c0be0ba849be4aea5eed3999c6 (patch)
tree6bdfd5433f9eb4358a67504d85fb903fe17fd9d9 /drivers/net/sfc/falcon.c
parent64ee3120f73b9e904d97ba66386b1e8e93b81385 (diff)
sfc: Cleanup RX queue information
Rename efx_nic::rss_queues to the more obvious n_rx_queues Remove efx_rx_queue::used and other stuff that's redundant with it. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r--drivers/net/sfc/falcon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 40dd643e930d..03194d6034ef 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1535,7 +1535,7 @@ static void falcon_setup_rss_indir_table(struct efx_nic *efx)
1535 offset < RX_RSS_INDIR_TBL_B0 + 0x800; 1535 offset < RX_RSS_INDIR_TBL_B0 + 0x800;
1536 offset += 0x10) { 1536 offset += 0x10) {
1537 EFX_POPULATE_DWORD_1(dword, RX_RSS_INDIR_ENT_B0, 1537 EFX_POPULATE_DWORD_1(dword, RX_RSS_INDIR_ENT_B0,
1538 i % efx->rss_queues); 1538 i % efx->n_rx_queues);
1539 falcon_writel(efx, &dword, offset); 1539 falcon_writel(efx, &dword, offset);
1540 i++; 1540 i++;
1541 } 1541 }
@@ -2785,7 +2785,7 @@ int falcon_init_nic(struct efx_nic *efx)
2785 if (falcon_rev(efx) >= FALCON_REV_B0) 2785 if (falcon_rev(efx) >= FALCON_REV_B0)
2786 EFX_SET_OWORD_FIELD(temp, NUM_KER, 0); 2786 EFX_SET_OWORD_FIELD(temp, NUM_KER, 0);
2787 else 2787 else
2788 EFX_SET_OWORD_FIELD(temp, NUM_KER, efx->rss_queues - 1); 2788 EFX_SET_OWORD_FIELD(temp, NUM_KER, efx->n_rx_queues - 1);
2789 if (EFX_WORKAROUND_7244(efx)) { 2789 if (EFX_WORKAROUND_7244(efx)) {
2790 EFX_SET_OWORD_FIELD(temp, UDP_FULL_SRCH_LIMIT, 8); 2790 EFX_SET_OWORD_FIELD(temp, UDP_FULL_SRCH_LIMIT, 8);
2791 EFX_SET_OWORD_FIELD(temp, UDP_WILD_SRCH_LIMIT, 8); 2791 EFX_SET_OWORD_FIELD(temp, UDP_WILD_SRCH_LIMIT, 8);