Message ID | 1476685548-15574-1-git-send-email-niklass@axis.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Niklas Cassel <niklas.cassel@axis.com> Date: Mon, 17 Oct 2016 08:25:48 +0200 > From: Niklas Cassel <niklas.cassel@axis.com> > > phy_device->supported is originally set by the PHY driver. > The ethernet driver should filter phy_device->supported to only contain > flags supported by the IP. > The IP supports setting rx and tx flow control independently, > therefore SUPPORTED_Pause and SUPPORTED_Asym_Pause should not be cleared. > If the flags are cleared, pause frames cannot be enabled (even if they > are supported by the PHY). > > Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> > Signed-off-by: Lars Persson <larper@axis.com> These two patches do not apply to the current 'net' tree, please respin.
diff --git a/drivers/net/ethernet/synopsys/dwc_eth_qos.c b/drivers/net/ethernet/synopsys/dwc_eth_qos.c index c9891eac9775..93a3a919f723 100644 --- a/drivers/net/ethernet/synopsys/dwc_eth_qos.c +++ b/drivers/net/ethernet/synopsys/dwc_eth_qos.c @@ -985,7 +985,8 @@ static int dwceqos_mii_probe(struct net_device *ndev) "phydev %p, phydev->phy_id 0xa%x, phydev->addr 0x%x\n", phydev, phydev->phy_id, phydev->addr); - phydev->supported &= PHY_GBIT_FEATURES; + phydev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause | + SUPPORTED_Asym_Pause; lp->link = 0; lp->speed = 0;