Merge tag 'mac80211-next-for-davem-2018-03-29' of git://git.kernel.org/pub/scm/linux...

[mirror_ubuntu-eoan-kernel.git] / drivers / net / ethernet / freescale / dpaa / dpaa_ethtool.c

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
index faea674094b96743168f1c8edc6e875d0467f59c..2f933b6b2f4e79b9e1359d8a9b57ba6af4acbfb9 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
@@ -211,7 +211,7 @@ static int dpaa_set_pauseparam(struct net_device *net_dev,
        if (epause->rx_pause)
                newadv = ADVERTISED_Pause | ADVERTISED_Asym_Pause;
        if (epause->tx_pause)
-               newadv |= ADVERTISED_Asym_Pause;
+               newadv ^= ADVERTISED_Asym_Pause;
 
        oldadv = phydev->advertising &
                        (ADVERTISED_Pause | ADVERTISED_Asym_Pause);
@@ -344,7 +344,7 @@ static void dpaa_get_ethtool_stats(struct net_device *net_dev,
 
        /* gather congestion related counters */
        cg_num    = 0;
-       cg_status = 0;
+       cg_status = false;
        cg_time   = jiffies_to_msecs(priv->cgr_data.congested_jiffies);
        if (qman_query_cgr_congested(&priv->cgr_data.cgr, &cg_status) == 0) {
                cg_num    = priv->cgr_data.cgr_congested_count;