summaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx4/en_rx.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-06-11 10:58:01 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-06-11 10:58:01 +0200
commit4894e4aca82aca927d0404ce61f021f790de4b1e (patch)
treebbe0d083829f5858295298f188d885367cf4b1f6 /drivers/net/mlx4/en_rx.c
parentInput: appletouch - improve finger detection (diff)
parentLinux 2.6.30 (diff)
downloadlinux-4894e4aca82aca927d0404ce61f021f790de4b1e.tar.xz
linux-4894e4aca82aca927d0404ce61f021f790de4b1e.zip
Merge commit 'v2.6.30' into next
Diffstat (limited to 'drivers/net/mlx4/en_rx.c')
-rw-r--r--drivers/net/mlx4/en_rx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 7942c4d3cd88..9ee873e872b3 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -951,7 +951,6 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
if (err) {
mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn);
goto out;
- return err;
}
qp->event = mlx4_en_sqp_event;