]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
sfc: Remove initialisation of RX_FILTER_CTL_REG.NUM_KER
authorBen Hutchings <bhutchings@solarflare.com>
Mon, 1 Sep 2008 11:47:52 +0000 (12:47 +0100)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 3 Sep 2008 13:53:46 +0000 (09:53 -0400)
We have long since given up doing RSS on Falcon A1 and therefore we
would always write the default value of 0.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/sfc/falcon.c

index 03194d6034ef2042fe0d8673b2545c97532fe120..bfae0826848a53e22132ebd2c018db3db188b014 100644 (file)
@@ -2780,19 +2780,14 @@ int falcon_init_nic(struct efx_nic *efx)
        EFX_INVERT_OWORD(temp);
        falcon_write(efx, &temp, FATAL_INTR_REG_KER);
 
-       /* Set number of RSS queues for receive path. */
-       falcon_read(efx, &temp, RX_FILTER_CTL_REG);
-       if (falcon_rev(efx) >= FALCON_REV_B0)
-               EFX_SET_OWORD_FIELD(temp, NUM_KER, 0);
-       else
-               EFX_SET_OWORD_FIELD(temp, NUM_KER, efx->n_rx_queues - 1);
        if (EFX_WORKAROUND_7244(efx)) {
+               falcon_read(efx, &temp, RX_FILTER_CTL_REG);
                EFX_SET_OWORD_FIELD(temp, UDP_FULL_SRCH_LIMIT, 8);
                EFX_SET_OWORD_FIELD(temp, UDP_WILD_SRCH_LIMIT, 8);
                EFX_SET_OWORD_FIELD(temp, TCP_FULL_SRCH_LIMIT, 8);
                EFX_SET_OWORD_FIELD(temp, TCP_WILD_SRCH_LIMIT, 8);
+               falcon_write(efx, &temp, RX_FILTER_CTL_REG);
        }
-       falcon_write(efx, &temp, RX_FILTER_CTL_REG);
 
        falcon_setup_rss_indir_table(efx);