git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
mlx4
/
en_cq.c
diff --git
a/drivers/net/mlx4/en_cq.c
b/drivers/net/mlx4/en_cq.c
index
91f50de
..
a276125
100644
(file)
--- a/
drivers/net/mlx4/en_cq.c
+++ b/
drivers/net/mlx4/en_cq.c
@@
-125,8
+125,10
@@
void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
if (cq->is_tx)
del_timer(&cq->timer);
- else
+ else
{
napi_disable(&cq->napi);
+ netif_napi_del(&cq->napi);
+ }
mlx4_cq_free(mdev->dev, &cq->mcq);
}