From b12e5432c3164d572b764355f38e1b52a4eb5d8a Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Mon, 2 Jan 2012 04:07:43 +0000 Subject: [PATCH] --- yaml --- r: 279166 b: refs/heads/master c: 1c015b3b82c92fad375ce7dfff54799cfdfb7a15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/fw.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 89f9217ebb0f..0fde0b9bbfdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e27ca69446e98b666b215b8ba71bf29281ce674 +refs/heads/master: 1c015b3b82c92fad375ce7dfff54799cfdfb7a15 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c b/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c index 8bcc66f2c2a3..a424a19280cc 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c @@ -657,7 +657,12 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave, u8 port_type; int err; -#define MLX4_VF_PORT_ETH_ONLY_MASK 0xE6 +#define MLX4_PORT_SUPPORT_IB (1 << 0) +#define MLX4_PORT_SUGGEST_TYPE (1 << 3) +#define MLX4_PORT_DEFAULT_SENSE (1 << 4) +#define MLX4_VF_PORT_ETH_ONLY_MASK (0xff & ~MLX4_PORT_SUPPORT_IB & \ + ~MLX4_PORT_SUGGEST_TYPE & \ + ~MLX4_PORT_DEFAULT_SENSE) err = mlx4_cmd_box(dev, 0, outbox->dma, vhcr->in_modifier, 0, MLX4_CMD_QUERY_PORT, MLX4_CMD_TIME_CLASS_B,