| Message ID | 20181207083026.173789-1-tarick@google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/mlx4_core: Correctly set PFC param if global pause is turned off. | expand |
From: Tarick Bedeir <tarick@google.com> Date: Fri, 7 Dec 2018 00:30:26 -0800 > rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1. > > Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests") > Signed-off-by: Tarick Bedeir <tarick@google.com> Tariq and co., please review.
On 12/7/2018 10:30 AM, Tarick Bedeir wrote: > rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1. > > Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests") > Signed-off-by: Tarick Bedeir <tarick@google.com> > --- > drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c > index f11b45001cad..d290f0787dfb 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c > +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c > @@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev, > > tx_pause = !!(pause->tx_pause); > rx_pause = !!(pause->rx_pause); > - rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause); > - tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause); > + rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp; > + tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp; > > err = mlx4_SET_PORT_general(mdev->dev, priv->port, > priv->rx_skb_size + ETH_FCS_LEN, > thanks for the Tarick. Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
From: Tarick Bedeir <tarick@google.com> Date: Fri, 7 Dec 2018 00:30:26 -0800 > rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1. > > Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests") > Signed-off-by: Tarick Bedeir <tarick@google.com> Applied and queued up for -stable.
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index f11b45001cad..d290f0787dfb 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -1084,8 +1084,8 @@ static int mlx4_en_set_pauseparam(struct net_device *dev, tx_pause = !!(pause->tx_pause); rx_pause = !!(pause->rx_pause); - rx_ppp = priv->prof->rx_ppp && !(tx_pause || rx_pause); - tx_ppp = priv->prof->tx_ppp && !(tx_pause || rx_pause); + rx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->rx_ppp; + tx_ppp = (tx_pause || rx_pause) ? 0 : priv->prof->tx_ppp; err = mlx4_SET_PORT_general(mdev->dev, priv->port, priv->rx_skb_size + ETH_FCS_LEN,
rx_ppp and tx_ppp can be set between 0 and 255, so don't clamp to 1. Fixes: 6e8814ceb7e8 ("net/mlx4_en: Fix mixed PFC and Global pause user control requests") Signed-off-by: Tarick Bedeir <tarick@google.com> --- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)