From cee5fd9f6df6c5317f29a746e6694bdd05a85978 Mon Sep 17 00:00:00 2001 From: Or Gerlitz Date: Thu, 17 Jan 2013 05:30:43 +0000 Subject: [PATCH] --- yaml --- r: 349233 b: refs/heads/master c: ca4c7b35f75492de7fbf5ee95be07481c348caee h: refs/heads/master i: 349231: 8b2a00c33493cd5331554763a5a5a2727795fec5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/main.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1ae5415c7b01..070fdc999445 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 213815a1e6ae70b9648483b110bc5081795f99e8 +refs/heads/master: ca4c7b35f75492de7fbf5ee95be07481c348caee diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/main.c b/trunk/drivers/net/ethernet/mellanox/mlx4/main.c index e1bafffbc3b1..a6542d75374c 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/main.c @@ -1790,15 +1790,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) int i; if (msi_x) { - /* In multifunction mode each function gets 2 msi-X vectors - * one for data path completions anf the other for asynch events - * or command completions */ - if (mlx4_is_mfunc(dev)) { - nreq = 2; - } else { - nreq = min_t(int, dev->caps.num_eqs - - dev->caps.reserved_eqs, nreq); - } + nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, + nreq); entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); if (!entries)