[XFS] Fix merge failures

[linux-2.6-omap-h63xx.git] / drivers / net / mlx4 / en_main.c

diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 1b0eebf84f76e43432c75ca9d0c09635ecbfa00a..c1c05852a95ebf34e357f86a6b0465758e5458f9 100644 (file)
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -35,7 +35,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
-#include <linux/cpumask.h>
 
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/device.h>
@@ -171,9 +170,9 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
                mlx4_info(mdev, "Using %d tx rings for port:%d\n",
                          mdev->profile.prof[i].tx_ring_num, i);
                if (!mdev->profile.prof[i].rx_ring_num) {
-                       mdev->profile.prof[i].rx_ring_num = 1;
+                       mdev->profile.prof[i].rx_ring_num = dev->caps.num_comp_vectors;
                        mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",
-                                 1, i);
+                                 mdev->profile.prof[i].rx_ring_num, i);
                } else
                        mlx4_info(mdev, "Using %d rx rings for port:%d\n",
                                  mdev->profile.prof[i].rx_ring_num, i);