dpaa_eth: fix pause capability advertisement logic

The ADVERTISED_Asym_Pause bit was being improperly set when both
rx and tx pause were enabled. When rx and tx are both enabled, only
the ADVERTISED_Pause bit is supposed to be set.

Signed-off-by: Jake Moroni <[email protected]>
Acked-by: Madalin Bucur <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c
index faea674094b96743168f1c8edc6e875d0467f59c..85306d1b2acf5b3dbfb64a6d5b2dae46818accec 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);