From dd4444f1985a52d382bd590e2d60d7043afaa074 Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Mon, 29 Dec 2008 18:38:21 -0800 Subject: [PATCH] --- yaml --- r: 123997 b: refs/heads/master c: c2b559ed8683ffb5a7bdd9e71b3803b231623c86 h: refs/heads/master i: 123995: 8242b5f01edfbc44a25211076b8fbdd71d924c9b v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 10c612f71018..b3c6da357186 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68888d105365366c5e1e0424cc939c1fc757f9c4 +refs/heads/master: c2b559ed8683ffb5a7bdd9e71b3803b231623c86 diff --git a/trunk/drivers/net/mlx4/en_main.c b/trunk/drivers/net/mlx4/en_main.c index c1c05852a95e..34f3a191fbdf 100644 --- a/trunk/drivers/net/mlx4/en_main.c +++ b/trunk/drivers/net/mlx4/en_main.c @@ -170,7 +170,8 @@ 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 = dev->caps.num_comp_vectors; + 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); } else