[PATCH net] net/mlx4: Remove shared_ports variable at mlx4_enable_msi_x

[PATCH net] net/mlx4: Remove shared_ports variable at mlx4_enable_msi_x

[clsoto]

From: Carol L Soto <clsoto@linux.vnet.ibm.com>

If we get MAX_MSIX interrupts would like to have each receive ring
with his own msix interrupt line. Do not need the shared_ports
variable at mlx4_enable_msix

Fixes: 9293267a3e2a ('net/mlx4_core: Capping number of requested MSIXs to MAX_MSIX')
Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com>
Acked-by: Matan Barak <matanb@mellanox.com>

---
 drivers/net/ethernet/mellanox/mlx4/main.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 006757f..cc3a989 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2669,14 +2669,11 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 
 	if (msi_x) {
 		int nreq = dev->caps.num_ports * num_online_cpus() + 1;
-		bool shared_ports = false;
 
 		nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
 			     nreq);
-		if (nreq > MAX_MSIX) {
+		if (nreq > MAX_MSIX)
 			nreq = MAX_MSIX;
-			shared_ports = true;
-		}
 
 		entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
 		if (!entries)
@@ -2699,9 +2696,6 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 		bitmap_zero(priv->eq_table.eq[MLX4_EQ_ASYNC].actv_ports.ports,
 			    dev->caps.num_ports);
 
-		if (MLX4_IS_LEGACY_EQ_MODE(dev->caps))
-			shared_ports = true;
-
 		for (i = 0; i < dev->caps.num_comp_vectors + 1; i++) {
 			if (i == MLX4_EQ_ASYNC)
 				continue;
@@ -2709,7 +2703,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 			priv->eq_table.eq[i].irq =
 				entries[i + 1 - !!(i > MLX4_EQ_ASYNC)].vector;
 
-			if (shared_ports) {
+			if (MLX4_IS_LEGACY_EQ_MODE(dev->caps)) {
 				bitmap_fill(priv->eq_table.eq[i].actv_ports.ports,
 					    dev->caps.num_ports);
 				/* We don't set affinity hint when there
-- 
1.8.3.1

Re: [PATCH net] net/mlx4: Remove shared_ports variable at mlx4_enable_msi_x

[David Miller]

From: clsoto@linux.vnet.ibm.com
Date: Wed,  7 Oct 2015 12:31:46 -0400

> From: Carol L Soto <clsoto@linux.vnet.ibm.com>
> 
> If we get MAX_MSIX interrupts would like to have each receive ring
> with his own msix interrupt line. Do not need the shared_ports
> variable at mlx4_enable_msix
> 
> Fixes: 9293267a3e2a ('net/mlx4_core: Capping number of requested MSIXs to MAX_MSIX')
> Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com>
> Acked-by: Matan Barak <matanb@mellanox.com>

Applied, thanks.

Re: [PATCH net] net/mlx4: Remove shared_ports variable at mlx4_enable_msi_x

[Or Gerlitz]

On 10/8/2015 3:20 PM, David Miller wrote:
> Applied, thanks.

Hi Dave,

As I wrote an hour ago, I took this one and now sent it out within a 
small series to net.

I just made the change-log a little better, so if you want, it's ok to 
stick with what you
picked and avoid taking it from what I sent, sorry for any possible 
confusion created here.

Or.