From da309b5bcb71c14e0b308d6785b5aee683a2e3cb Mon Sep 17 00:00:00 2001 From: Alexander Guller Date: Sun, 9 Oct 2011 05:29:26 +0000 Subject: [PATCH] --- yaml --- r: 266477 b: refs/heads/master c: 999bb4b3831abd6ad53023a0b8e5d304875927dd h: refs/heads/master i: 266475: 56628e0a23496615b20c13c8c908c3706d7f3fb2 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_port.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e0ad03a6363..d71d15e01d31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7398af403f621418fa05c6936cac34aa06b5a758 +refs/heads/master: 999bb4b3831abd6ad53023a0b8e5d304875927dd diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_port.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_port.c index 5ada5b469112..8824309bb625 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_port.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_port.c @@ -128,7 +128,7 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn, memset(context, 0, sizeof *context); context->base_qpn = cpu_to_be32(base_qpn); - context->n_mac = 0x2; + context->n_mac = dev->caps.log_num_macs; context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_SHIFT | base_qpn); context->mcast = cpu_to_be32(m_promisc << SET_PORT_MC_PROMISC_SHIFT |