aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNisar Sayed <Nisar.Sayed@microchip.com>2017-09-11 13:43:11 -0400
committerDavid S. Miller <davem@davemloft.net>2017-09-12 23:36:30 -0400
commit9c0827317f235865ae421293f8aecf6cb327a63e (patch)
tree0e25b5b31a5754557f8d50aadd5025a99a6d43ec
parent230cfd2dbc228a6992287d31c5d93bc6c2552024 (diff)
smsc95xx: Configure pause time to 0xffff when tx flow control enabled
Configure pause time to 0xffff when tx flow control enabled Set pause time to 0xffff in the pause frame to indicate the partner to stop sending the packets. When RX buffer frees up, the device sends pause frame with pause time zero for partner to resume transmission. Fixes: 2f7ca802bdae ("Add SMSC LAN9500 USB2.0 10/100 ethernet adapter driver") Signed-off-by: Nisar Sayed <Nisar.Sayed@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/smsc95xx.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 340c13484e5c..309b88acd3d0 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -526,7 +526,7 @@ static void smsc95xx_set_multicast(struct net_device *netdev)
526static int smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex, 526static int smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,
527 u16 lcladv, u16 rmtadv) 527 u16 lcladv, u16 rmtadv)
528{ 528{
529 u32 flow, afc_cfg = 0; 529 u32 flow = 0, afc_cfg;
530 530
531 int ret = smsc95xx_read_reg(dev, AFC_CFG, &afc_cfg); 531 int ret = smsc95xx_read_reg(dev, AFC_CFG, &afc_cfg);
532 if (ret < 0) 532 if (ret < 0)
@@ -537,20 +537,19 @@ static int smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex,
537 537
538 if (cap & FLOW_CTRL_RX) 538 if (cap & FLOW_CTRL_RX)
539 flow = 0xFFFF0002; 539 flow = 0xFFFF0002;
540 else
541 flow = 0;
542 540
543 if (cap & FLOW_CTRL_TX) 541 if (cap & FLOW_CTRL_TX) {
544 afc_cfg |= 0xF; 542 afc_cfg |= 0xF;
545 else 543 flow |= 0xFFFF0000;
544 } else {
546 afc_cfg &= ~0xF; 545 afc_cfg &= ~0xF;
546 }
547 547
548 netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n", 548 netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
549 cap & FLOW_CTRL_RX ? "enabled" : "disabled", 549 cap & FLOW_CTRL_RX ? "enabled" : "disabled",
550 cap & FLOW_CTRL_TX ? "enabled" : "disabled"); 550 cap & FLOW_CTRL_TX ? "enabled" : "disabled");
551 } else { 551 } else {
552 netif_dbg(dev, link, dev->net, "half duplex\n"); 552 netif_dbg(dev, link, dev->net, "half duplex\n");
553 flow = 0;
554 afc_cfg |= 0xF; 553 afc_cfg |= 0xF;
555 } 554 }
556 555