diff options
| author | Alexander Guller | 2014-07-16 10:57:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-07-17 08:26:24 +0200 |
| commit | 75908376038c44ea154e4c2782ee367e679c81b1 (patch) | |
| tree | 7ced88c8ffd10832355bc801831392ee295f6874 /drivers/net/ethernet/mellanox/mlx4/mcg.c | |
| parent | net/mlx4_core: Make sure that negative array index isn't used (diff) | |
| download | kernel-qcow2-linux-75908376038c44ea154e4c2782ee367e679c81b1.tar.gz kernel-qcow2-linux-75908376038c44ea154e4c2782ee367e679c81b1.tar.xz kernel-qcow2-linux-75908376038c44ea154e4c2782ee367e679c81b1.zip | |
net/mlx4_core: Make sure the max number of QPs per MCG isn't exceeded
In B0 steering mode when adding QPs to the default MCG entry need
to check that maximal number of QPs per MCG entry was not exceeded.
Signed-off-by: Alexander Guller <alexg@mellanox.com>
Reviewed-by: Aviad Yehezkel <aviadye@mellanox.co.il>
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mcg.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mcg.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c index 04a8636a0b7e..39ab85a56c9a 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mcg.c +++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c @@ -477,8 +477,14 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port, /* now need to add all the promisc qps to default entry */ memset(mgm, 0, sizeof *mgm); members_count = 0; - list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list) + list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list) { + if (members_count == dev->caps.num_qp_per_mgm) { + /* entry is full */ + err = -ENOMEM; + goto out_list; + } mgm->qp[members_count++] = cpu_to_be32(dqp->qpn & MGM_QPN_MASK); + } mgm->members_count = cpu_to_be32(members_count | MLX4_PROT_ETH << 30); err = mlx4_WRITE_PROMISC(dev, port, steer, mailbox); |