]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
net/mlx4_core: Fix build failure introduced by the EQ pool changes
authorOr Gerlitz <ogerlitz@mellanox.com>
Tue, 2 Jun 2015 07:29:48 +0000 (10:29 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2015 02:34:51 +0000 (19:34 -0700)
When CONFIG_RFS_ACCEL or SMP aren't set, we fail to build, fix it.

Also, avoid build warning as of unused function on that setup.

Fixes: c66fa19c405a ('net/mlx4: Add EQ pool')
Reported-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/eq.c

index 11168825a9fab457c380c1a663b15dab2500b43e..aae13adfb492b885bcf2fba03b042b949c3f5575 100644 (file)
@@ -221,6 +221,7 @@ static void mlx4_slave_event(struct mlx4_dev *dev, int slave,
        slave_event(dev, slave, eqe);
 }
 
+#if defined(CONFIG_SMP)
 static void mlx4_set_eq_affinity_hint(struct mlx4_priv *priv, int vec)
 {
        int hint_err;
@@ -234,6 +235,7 @@ static void mlx4_set_eq_affinity_hint(struct mlx4_priv *priv, int vec)
        if (hint_err)
                mlx4_warn(dev, "irq_set_affinity_hint failed, err %d\n", hint_err);
 }
+#endif
 
 int mlx4_gen_pkey_eqe(struct mlx4_dev *dev, int slave, u8 port)
 {
@@ -1207,8 +1209,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
                                             MLX4_NUM_ASYNC_EQE + MLX4_NUM_SPARE_EQE,
                                             0, &priv->eq_table.eq[MLX4_EQ_ASYNC]);
                } else {
-#ifdef CONFIG_RFS_ACCEL
                        struct mlx4_eq  *eq = &priv->eq_table.eq[i];
+#ifdef CONFIG_RFS_ACCEL
                        int port = find_first_bit(eq->actv_ports.ports,
                                                  dev->caps.num_ports) + 1;