git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
mlx4
/
en_rx.c
diff --git
a/drivers/net/mlx4/en_rx.c
b/drivers/net/mlx4/en_rx.c
index 7942c4d3cd8835dd2bf29d6522e4a1f2ab92a099..9ee873e872b34a2c02db98ab59e3b5c3f2616b13 100644
(file)
--- 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;