From 387047b402ff7359eb2b2f9b1f7aea7a9004294c Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Wed, 3 Aug 2011 16:38:59 -0700 Subject: [PATCH] --- yaml --- r: 262478 b: refs/heads/master c: 06fa0a883a01a34a0449ec116c5288c1d196b4b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_port.c | 2 +- trunk/drivers/net/mlx4/main.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bc0dd296e8e3..0d97b425b291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5be1334062a2f358dc65016b5181e6edbfe3bd1e +refs/heads/master: 06fa0a883a01a34a0449ec116c5288c1d196b4b0 diff --git a/trunk/drivers/net/mlx4/en_port.c b/trunk/drivers/net/mlx4/en_port.c index 5e7109178061..5ada5b469112 100644 --- a/trunk/drivers/net/mlx4/en_port.c +++ b/trunk/drivers/net/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 = 0x7; + context->n_mac = 0x2; context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_SHIFT | base_qpn); context->mcast = cpu_to_be32(m_promisc << SET_PORT_MC_PROMISC_SHIFT | diff --git a/trunk/drivers/net/mlx4/main.c b/trunk/drivers/net/mlx4/main.c index c94b3426d355..f0ee35df4dd7 100644 --- a/trunk/drivers/net/mlx4/main.c +++ b/trunk/drivers/net/mlx4/main.c @@ -1117,6 +1117,8 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) info->port = port; mlx4_init_mac_table(dev, &info->mac_table); mlx4_init_vlan_table(dev, &info->vlan_table); + info->base_qpn = dev->caps.reserved_qps_base[MLX4_QP_REGION_ETH_ADDR] + + (port - 1) * (1 << log_num_mac); sprintf(info->dev_name, "mlx4_port%d", port); info->port_attr.attr.name = info->dev_name;