From 4b4d9b1019e372fdcf81ee33ab8870855251cda4 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Thu, 24 May 2012 16:08:09 +0300 Subject: [PATCH] --- yaml --- r: 310517 b: refs/heads/master c: edc4a67e15e34d2b3a2ab968625fd157751125d8 h: refs/heads/master i: 310515: f3dc4002df0e36d46bbe1dd10c952ff48361869b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/port.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 25f8a5de4ea5..985901d33d8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3aac6ff16a2097be668975fd51084df2e27e4999 +refs/heads/master: edc4a67e15e34d2b3a2ab968625fd157751125d8 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/port.c b/trunk/drivers/net/ethernet/mellanox/mlx4/port.c index 1fe2c7a8b40c..a8fb52992c64 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/port.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/port.c @@ -697,10 +697,10 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod, if (slave != dev->caps.function) memset(inbox->buf, 0, 256); if (dev->flags & MLX4_FLAG_OLD_PORT_CMDS) { - *(u8 *) inbox->buf = !!reset_qkey_viols << 6; + *(u8 *) inbox->buf |= !!reset_qkey_viols << 6; ((__be32 *) inbox->buf)[2] = agg_cap_mask; } else { - ((u8 *) inbox->buf)[3] = !!reset_qkey_viols; + ((u8 *) inbox->buf)[3] |= !!reset_qkey_viols; ((__be32 *) inbox->buf)[1] = agg_cap_mask; }