lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 06/89] net/mlx4_core: Correctly set PFC param if global pause is turned off.
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tarick Bedeir <tarick@google.com>

    [ Upstream commit bd5122cd1e0644d8bd8dd84517c932773e999766 ]

    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>
    Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
    @@ -1070,8 +1070,8 @@ static int mlx4_en_set_pauseparam(struct

    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,

    \
     
     \ /
      Last update: 2018-12-14 13:34    [W:3.322 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site