Merge tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[~andy/linux] / drivers / net / ethernet / mellanox / mlx4 / eq.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 9b15d0219950a02e41308356c3e56a1a7fdccae8..99a04648fab079c41084ad1a601bac6e903ceaab 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -39,6 +39,7 @@
 #include <linux/dma-mapping.h>
 
 #include <linux/mlx4/cmd.h>
+#include <linux/cpu_rmap.h>
 
 #include "mlx4.h"
 #include "fw.h"
@@ -1074,7 +1075,8 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
 }
 EXPORT_SYMBOL(mlx4_test_interrupts);
 
-int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector)
+int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap,
+                  int *vector)
 {
 
        struct mlx4_priv *priv = mlx4_priv(dev);
@@ -1088,6 +1090,14 @@ int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector)
                        snprintf(priv->eq_table.irq_names +
                                        vec * MLX4_IRQNAME_SIZE,
                                        MLX4_IRQNAME_SIZE, "%s", name);
+#ifdef CONFIG_RFS_ACCEL
+                       if (rmap) {
+                               err = irq_cpu_rmap_add(rmap,
+                                                      priv->eq_table.eq[vec].irq);
+                               if (err)
+                                       mlx4_warn(dev, "Failed adding irq rmap\n");
+                       }
+#endif
                        err = request_irq(priv->eq_table.eq[vec].irq,
                                          mlx4_msi_x_interrupt, 0,
                                          &priv->eq_table.irq_names[vec<<5],