Re: [patch net-next] net/mlx4_en: fix a condition

2017-02-06 Thread David Miller 
From: Dan Carpenter 
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 

Applied.

Re: [patch net-next] net/mlx4_en: fix a condition

2017-02-05 Thread Tariq Toukan 


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 

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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reviewed-by: Tariq Toukan 
Thanks Dan.

[patch net-next] net/mlx4_en: fix a condition

2017-02-03 Thread Dan Carpenter 
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 

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);