[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170203095459.GA5704@mwanda>
Date: Fri, 3 Feb 2017 12:54:59 +0300
From: Dan Carpenter <dan.carpenter@...cle.com>
To: Yishai Hadas <yishaih@...lanox.com>,
Shaker Daibes <shakerd@...lanox.com>
Cc: netdev@...r.kernel.org, linux-rdma@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [patch net-next] net/mlx4_en: fix a condition
There is a "||" vs "|" typo here so we test 0x1 instead of 0x6.
Fixes: 1f8176f7352a ("net/mlx4_en: Check the enabling pptx/pprx flags in SET_PORT wrapper flow")
Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 5053c949148f..4e36e287d605 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -1395,7 +1395,7 @@ static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
gen_context);
if (gen_context->flags &
- (MLX4_FLAG_V_PPRX_MASK || MLX4_FLAG_V_PPTX_MASK))
+ (MLX4_FLAG_V_PPRX_MASK | MLX4_FLAG_V_PPTX_MASK))
mlx4_en_set_port_global_pause(dev, slave,
gen_context);
Powered by blists - more mailing lists