From b51e8f9a42896f1d50d0edadfaeb31c430d711f4 Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Thu, 21 Oct 2010 12:39:08 -0700 Subject: [PATCH] --- yaml --- r: 217738 b: refs/heads/master c: 7ac870ed7d2316587ec06747c28cb9f44f67997d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_port.c | 4 ++-- trunk/drivers/net/mlx4/en_port.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c24cd65aac62..08377f8967f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96dfa684c85d24b697f865f37a4f0c8678fc86e9 +refs/heads/master: 7ac870ed7d2316587ec06747c28cb9f44f67997d diff --git a/trunk/drivers/net/mlx4/en_port.c b/trunk/drivers/net/mlx4/en_port.c index a29abe845d2e..a24988799e01 100644 --- a/trunk/drivers/net/mlx4/en_port.c +++ b/trunk/drivers/net/mlx4/en_port.c @@ -127,8 +127,8 @@ 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->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_SHIFT | base_qpn); - context->mcast = cpu_to_be32(1 << SET_PORT_PROMISC_SHIFT | base_qpn); + context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_EN_SHIFT | base_qpn); + context->mcast = cpu_to_be32(1 << SET_PORT_PROMISC_MODE_SHIFT | base_qpn); context->intra_no_vlan = 0; context->no_vlan = MLX4_NO_VLAN_IDX; context->intra_vlan_miss = 0; diff --git a/trunk/drivers/net/mlx4/en_port.h b/trunk/drivers/net/mlx4/en_port.h index e6477f12beb5..935489120400 100644 --- a/trunk/drivers/net/mlx4/en_port.h +++ b/trunk/drivers/net/mlx4/en_port.h @@ -36,7 +36,8 @@ #define SET_PORT_GEN_ALL_VALID 0x7 -#define SET_PORT_PROMISC_SHIFT 31 +#define SET_PORT_PROMISC_EN_SHIFT 31 +#define SET_PORT_PROMISC_MODE_SHIFT 30 enum { MLX4_CMD_SET_VLAN_FLTR = 0x47,