net: Refactor full duplex flow control resolution
These 4 drivers have identical full duplex flow control resolution functions. This patch changes them all to use one common function. The function in question decides whether a device should enable TX and RX flow control in a standard way (IEEE 802.3-2005 table 28B-3), so this should also be useful for other drivers. Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
e18ce34654
commit
bc02ff95fe
@@ -642,28 +642,6 @@ static int smsc911x_phy_loopbacktest(struct net_device *dev)
|
||||
}
|
||||
#endif /* USE_PHY_WORK_AROUND */
|
||||
|
||||
static u8 smsc95xx_resolve_flowctrl_fulldplx(u16 lcladv, u16 rmtadv)
|
||||
{
|
||||
u8 cap = 0;
|
||||
|
||||
if (lcladv & ADVERTISE_PAUSE_CAP) {
|
||||
if (lcladv & ADVERTISE_PAUSE_ASYM) {
|
||||
if (rmtadv & LPA_PAUSE_CAP)
|
||||
cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
|
||||
else if (rmtadv & LPA_PAUSE_ASYM)
|
||||
cap = FLOW_CTRL_RX;
|
||||
} else {
|
||||
if (rmtadv & LPA_PAUSE_CAP)
|
||||
cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
|
||||
}
|
||||
} else if (lcladv & ADVERTISE_PAUSE_ASYM) {
|
||||
if ((rmtadv & LPA_PAUSE_CAP) && (rmtadv & LPA_PAUSE_ASYM))
|
||||
cap = FLOW_CTRL_TX;
|
||||
}
|
||||
|
||||
return cap;
|
||||
}
|
||||
|
||||
static void smsc911x_phy_update_flowcontrol(struct smsc911x_data *pdata)
|
||||
{
|
||||
struct phy_device *phy_dev = pdata->phy_dev;
|
||||
@@ -674,7 +652,7 @@ static void smsc911x_phy_update_flowcontrol(struct smsc911x_data *pdata)
|
||||
if (phy_dev->duplex == DUPLEX_FULL) {
|
||||
u16 lcladv = phy_read(phy_dev, MII_ADVERTISE);
|
||||
u16 rmtadv = phy_read(phy_dev, MII_LPA);
|
||||
u8 cap = smsc95xx_resolve_flowctrl_fulldplx(lcladv, rmtadv);
|
||||
u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);
|
||||
|
||||
if (cap & FLOW_CTRL_RX)
|
||||
flow = 0xFFFF0002;
|
||||
|
Reference in New Issue
Block a user