diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
| commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
| tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /drivers/net/bnx2x | |
| parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
| parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2x')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index bba21d5f708b..9d48659e3b28 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c | |||
| @@ -4229,7 +4229,7 @@ void bnx2x_update_coalesce(struct bnx2x *bp) | |||
| 4229 | 4229 | ||
| 4230 | for_each_eth_queue(bp, i) | 4230 | for_each_eth_queue(bp, i) |
| 4231 | bnx2x_update_coalesce_sb(bp, bp->fp[i].fw_sb_id, | 4231 | bnx2x_update_coalesce_sb(bp, bp->fp[i].fw_sb_id, |
| 4232 | bp->rx_ticks, bp->tx_ticks); | 4232 | bp->tx_ticks, bp->rx_ticks); |
| 4233 | } | 4233 | } |
| 4234 | 4234 | ||
| 4235 | static void bnx2x_init_sp_ring(struct bnx2x *bp) | 4235 | static void bnx2x_init_sp_ring(struct bnx2x *bp) |