diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-06-11 20:11:29 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-06-11 20:11:29 +0200 |
| commit | 924412f66fd9d21212e560a93792b0b607d46c6e (patch) | |
| tree | 823ac1d1f21062c6ad45d52f7bb5ad0a475dd123 /drivers/net | |
| parent | timers: Improve get_next_timer_interrupt() (diff) | |
| parent | nohz: Move next idle expiry time record into idle logic area (diff) | |
| download | linux-924412f66fd9d21212e560a93792b0b607d46c6e.tar.xz linux-924412f66fd9d21212e560a93792b0b607d46c6e.zip | |
Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks into timers/core
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/port.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c index 1fe2c7a8b40c..a8fb52992c64 100644 --- a/drivers/net/ethernet/mellanox/mlx4/port.c +++ b/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; } |