Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[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 c1c05852a95ebf34e357f86a6b0465758e5458f9..eda72dd2120f5a3af3291fabc3923ea5c5b94210 100644 (file)
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -169,13 +169,10 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
        mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
                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 = dev->caps.num_comp_vectors;
-                       mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",
-                                 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);
+               mdev->profile.prof[i].rx_ring_num =
+                       min_t(int, dev->caps.num_comp_vectors, MAX_RX_RINGS);
+               mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",
+                         mdev->profile.prof[i].rx_ring_num, i);
        }
 
        /* Create our own workqueue for reset/multicast tasks