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 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
en_txrx.c
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
b/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
index e6c434efbd46fc6862869d76e6e0bef32713802d..1c021a299baa48208b0d4329a596035294e0d1a4 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c
@@
-134,7
+134,7
@@
int mlx5e_napi_poll(struct napi_struct *napi, int budget)
return work_done;
}
-void mlx5e_completion_event(struct mlx5_core_cq *mcq)
+void mlx5e_completion_event(struct mlx5_core_cq *mcq
, struct mlx5_eqe *eqe
)
{
struct mlx5e_cq *cq = container_of(mcq, struct mlx5e_cq, mcq);