aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-07-11 05:31:41 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-11 20:07:41 -0400
commit20d7375c1fdf054ca8ab9e5b9fe7fe62b39fa218 (patch)
tree3e7656c31e7086eb908d1b07b9400f320d5e8270 /drivers/net/tg3.c
parent5efeeea1cf16b6382e1a9e2e389950024ba17f3e (diff)
tg3: Fix single MSI-X vector coalescing
The interrupt coalescing setup code used the TG3_FLG2_USING_MSIX flag to determine whether or not to configure the rx coalescing parameters. This is incorrect for the single MSI-X vector case. This patch changes the code to look at the TG3_FLG3_ENABLE_RSS instead. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 89aa48621787..57dba794d31e 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7447,7 +7447,7 @@ static void __tg3_set_coalesce(struct tg3 *tp, struct ethtool_coalesce *ec)
7447 tw32(HOSTCC_TXCOAL_MAXF_INT, 0); 7447 tw32(HOSTCC_TXCOAL_MAXF_INT, 0);
7448 } 7448 }
7449 7449
7450 if (!(tp->tg3_flags2 & TG3_FLG2_USING_MSIX)) { 7450 if (!(tp->tg3_flags3 & TG3_FLG3_ENABLE_RSS)) {
7451 tw32(HOSTCC_RXCOL_TICKS, ec->rx_coalesce_usecs); 7451 tw32(HOSTCC_RXCOL_TICKS, ec->rx_coalesce_usecs);
7452 tw32(HOSTCC_RXMAX_FRAMES, ec->rx_max_coalesced_frames); 7452 tw32(HOSTCC_RXMAX_FRAMES, ec->rx_max_coalesced_frames);
7453 tw32(HOSTCC_RXCOAL_MAXF_INT, ec->rx_max_coalesced_frames_irq); 7453 tw32(HOSTCC_RXCOAL_MAXF_INT, ec->rx_max_coalesced_frames_irq);