diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
| commit | 66fdc951720406deb3b0f17094cb16ec623f525d (patch) | |
| tree | 24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /drivers/net/mlx4/en_netdev.c | |
| parent | f425752fc66acf1d4e47970ea704ed7d31c14173 (diff) | |
| parent | 7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff) | |
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'drivers/net/mlx4/en_netdev.c')
| -rw-r--r-- | drivers/net/mlx4/en_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c index 438678ab2a10..7bcc49de1637 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/mlx4/en_netdev.c | |||
| @@ -583,7 +583,7 @@ int mlx4_en_start_port(struct net_device *dev) | |||
| 583 | err = mlx4_en_activate_cq(priv, cq); | 583 | err = mlx4_en_activate_cq(priv, cq); |
| 584 | if (err) { | 584 | if (err) { |
| 585 | mlx4_err(mdev, "Failed activating Rx CQ\n"); | 585 | mlx4_err(mdev, "Failed activating Rx CQ\n"); |
| 586 | goto rx_err; | 586 | goto cq_err; |
| 587 | } | 587 | } |
| 588 | for (j = 0; j < cq->size; j++) | 588 | for (j = 0; j < cq->size; j++) |
| 589 | cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK; | 589 | cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK; |