* [patch net-next] net/mlx4_en: fix a condition
@ 2017-02-03 9:54 Dan Carpenter
2017-02-05 8:26 ` Tariq Toukan
2017-02-06 17:01 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2017-02-03 9:54 UTC (permalink / raw)
To: Yishai Hadas, Shaker Daibes; +Cc: netdev, linux-rdma, kernel-janitors
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@oracle.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);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch net-next] net/mlx4_en: fix a condition
2017-02-03 9:54 [patch net-next] net/mlx4_en: fix a condition Dan Carpenter
@ 2017-02-05 8:26 ` Tariq Toukan
2017-02-06 17:01 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Tariq Toukan @ 2017-02-05 8:26 UTC (permalink / raw)
To: Dan Carpenter, Yishai Hadas, Shaker Daibes
Cc: netdev, linux-rdma, kernel-janitors
On 03/02/2017 11:54 AM, Dan Carpenter wrote:
> 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@oracle.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);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Thanks Dan.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch net-next] net/mlx4_en: fix a condition
2017-02-03 9:54 [patch net-next] net/mlx4_en: fix a condition Dan Carpenter
2017-02-05 8:26 ` Tariq Toukan
@ 2017-02-06 17:01 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-02-06 17:01 UTC (permalink / raw)
To: dan.carpenter; +Cc: yishaih, shakerd, netdev, linux-rdma, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 3 Feb 2017 12:54:59 +0300
> 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@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-06 17:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-03 9:54 [patch net-next] net/mlx4_en: fix a condition Dan Carpenter
2017-02-05 8:26 ` Tariq Toukan
2017-02-06 17:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).