From 10817243cdbd076a3914c1e8a5ef7c512bbaae91 Mon Sep 17 00:00:00 2001 From: Eugenia Emantayev Date: Wed, 15 Feb 2012 06:22:49 +0000 Subject: [PATCH] --- yaml --- r: 287701 b: refs/heads/master c: 75c6062cb797afe624d65c955eb867035622e782 h: refs/heads/master i: 287699: 6c6fe651cb89d2fcad9be52cd6114fc26c34b627 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 04acdde91c21..53e99e6cd19b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33b5d30cd8b200024d55ac5830c9efde1102ef4c +refs/heads/master: 75c6062cb797afe624d65c955eb867035622e782 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index dcd819bfb2f0..1420dbc947c2 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -2538,7 +2538,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave, int attach = vhcr->op_modifier; int block_loopback = vhcr->in_modifier >> 31; u8 steer_type_mask = 2; - enum mlx4_steer_type type = gid[7] & steer_type_mask; + enum mlx4_steer_type type = (gid[7] & steer_type_mask) >> 1; qpn = vhcr->in_modifier & 0xffffff; err = get_res(dev, slave, qpn, RES_QP, &rqp);