diff options
Diffstat (limited to 'drivers/net/bnx2x_main.c')
| -rw-r--r-- | drivers/net/bnx2x_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 951714a7f90a..6c67be679764 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c | |||
| @@ -4434,7 +4434,7 @@ static void bnx2x_update_coalesce(struct bnx2x *bp) | |||
| 4434 | REG_WR16(bp, BAR_USTRORM_INTMEM + | 4434 | REG_WR16(bp, BAR_USTRORM_INTMEM + |
| 4435 | USTORM_SB_HC_DISABLE_OFFSET(port, sb_id, | 4435 | USTORM_SB_HC_DISABLE_OFFSET(port, sb_id, |
| 4436 | U_SB_ETH_RX_CQ_INDEX), | 4436 | U_SB_ETH_RX_CQ_INDEX), |
| 4437 | bp->rx_ticks ? 0 : 1); | 4437 | (bp->rx_ticks/12) ? 0 : 1); |
| 4438 | 4438 | ||
| 4439 | /* HC_INDEX_C_ETH_TX_CQ_CONS */ | 4439 | /* HC_INDEX_C_ETH_TX_CQ_CONS */ |
| 4440 | REG_WR8(bp, BAR_CSTRORM_INTMEM + | 4440 | REG_WR8(bp, BAR_CSTRORM_INTMEM + |
| @@ -4444,7 +4444,7 @@ static void bnx2x_update_coalesce(struct bnx2x *bp) | |||
| 4444 | REG_WR16(bp, BAR_CSTRORM_INTMEM + | 4444 | REG_WR16(bp, BAR_CSTRORM_INTMEM + |
| 4445 | CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id, | 4445 | CSTORM_SB_HC_DISABLE_OFFSET(port, sb_id, |
| 4446 | C_SB_ETH_TX_CQ_INDEX), | 4446 | C_SB_ETH_TX_CQ_INDEX), |
| 4447 | bp->tx_ticks ? 0 : 1); | 4447 | (bp->tx_ticks/12) ? 0 : 1); |
| 4448 | } | 4448 | } |
| 4449 | } | 4449 | } |
| 4450 | 4450 | ||
| @@ -9069,12 +9069,12 @@ static int bnx2x_set_coalesce(struct net_device *dev, | |||
| 9069 | struct bnx2x *bp = netdev_priv(dev); | 9069 | struct bnx2x *bp = netdev_priv(dev); |
| 9070 | 9070 | ||
| 9071 | bp->rx_ticks = (u16) coal->rx_coalesce_usecs; | 9071 | bp->rx_ticks = (u16) coal->rx_coalesce_usecs; |
| 9072 | if (bp->rx_ticks > 3000) | 9072 | if (bp->rx_ticks > BNX2X_MAX_COALESCE_TOUT) |
| 9073 | bp->rx_ticks = 3000; | 9073 | bp->rx_ticks = BNX2X_MAX_COALESCE_TOUT; |
| 9074 | 9074 | ||
| 9075 | bp->tx_ticks = (u16) coal->tx_coalesce_usecs; | 9075 | bp->tx_ticks = (u16) coal->tx_coalesce_usecs; |
| 9076 | if (bp->tx_ticks > 0x3000) | 9076 | if (bp->tx_ticks > BNX2X_MAX_COALESCE_TOUT) |
| 9077 | bp->tx_ticks = 0x3000; | 9077 | bp->tx_ticks = BNX2X_MAX_COALESCE_TOUT; |
| 9078 | 9078 | ||
| 9079 | if (netif_running(dev)) | 9079 | if (netif_running(dev)) |
| 9080 | bnx2x_update_coalesce(bp); | 9080 | bnx2x_update_coalesce(bp); |
