* [PATCH v2] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
@ 2015-04-27 18:12 Murali Karicheri
2015-04-28 3:14 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Murali Karicheri @ 2015-04-27 18:12 UTC (permalink / raw)
To: netdev, davem, linux-kernel; +Cc: Murali Karicheri
Currently when interface type is MAC to Phy, netif_carrier_(on/off)
is called which is not needed as Phy lib already updates the carrier
status to net stack. This is needed only for other interface types
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
- v2: re-send to apply this on v4.1
- Fixed comment against initial version
- Ok to apply this to net-next. So changed subject prefix to reflect the same
drivers/net/ethernet/ti/netcp_ethss.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 2bef655..9b7e0a3 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -1765,7 +1765,9 @@ static void netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
ALE_PORT_STATE,
ALE_PORT_STATE_FORWARD);
- if (ndev && slave->open)
+ if (ndev && slave->open &&
+ slave->link_interface != SGMII_LINK_MAC_PHY &&
+ slave->link_interface != XGMII_LINK_MAC_PHY)
netif_carrier_on(ndev);
} else {
writel(mac_control, GBE_REG_ADDR(slave, emac_regs,
@@ -1773,7 +1775,9 @@ static void netcp_ethss_link_state_action(struct gbe_priv *gbe_dev,
cpsw_ale_control_set(gbe_dev->ale, slave->port_num,
ALE_PORT_STATE,
ALE_PORT_STATE_DISABLE);
- if (ndev)
+ if (ndev &&
+ slave->link_interface != SGMII_LINK_MAC_PHY &&
+ slave->link_interface != XGMII_LINK_MAC_PHY)
netif_carrier_off(ndev);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface
2015-04-27 18:12 [PATCH v2] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface Murali Karicheri
@ 2015-04-28 3:14 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-04-28 3:14 UTC (permalink / raw)
To: m-karicheri2; +Cc: netdev, linux-kernel
From: Murali Karicheri <m-karicheri2@ti.com>
Date: Mon, 27 Apr 2015 14:12:43 -0400
> Currently when interface type is MAC to Phy, netif_carrier_(on/off)
> is called which is not needed as Phy lib already updates the carrier
> status to net stack. This is needed only for other interface types
>
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-28 3:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-27 18:12 [PATCH v2] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface Murali Karicheri
2015-04-28 3:14 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).