| Message ID | 1518985564-27169-1-git-send-email-mail@jakemoroni.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] dpaa_eth: fix pause capability advertisement logic | expand |
> -----Original Message----- > From: Jake Moroni [mailto:mail@jakemoroni.com] > Sent: Sunday, February 18, 2018 10:26 PM > To: Madalin-cristian Bucur <madalin.bucur@nxp.com> > Cc: netdev@vger.kernel.org; Jake Moroni <mail@jakemoroni.com> > Subject: [PATCH net-next] 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 <mail@jakemoroni.com> > --- > drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c > b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c > index faea674..85306d1 100644 > --- 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); > -- > 2.7.4 Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
From: Jake Moroni <mail@jakemoroni.com> Date: Sun, 18 Feb 2018 15:26:04 -0500 > 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 <mail@jakemoroni.com> Applied to net-next, thank you.
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c index faea674..85306d1 100644 --- 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);
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 <mail@jakemoroni.com> --- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)