Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758471AbbDXPSE (ORCPT ); Fri, 24 Apr 2015 11:18:04 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:39752 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755723AbbDXPR7 (ORCPT ); Fri, 24 Apr 2015 11:17:59 -0400 Message-ID: <553A5EA8.4010908@ti.com> Date: Fri, 24 Apr 2015 11:18:00 -0400 From: Murali Karicheri User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Sergei Shtylyov CC: , , Subject: Re: [PATCH] net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface References: <1429816627-24337-1-git-send-email-m-karicheri2@ti.com> <553A4623.2070802@cogentembedded.com> In-Reply-To: <553A4623.2070802@cogentembedded.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2117 Lines: 62 On 04/24/2015 09:33 AM, Sergei Shtylyov wrote: > Hello. > > On 4/23/2015 10:17 PM, Murali Karicheri wrote: > >> 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 >> --- >> 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..0a1ef2e 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))) > > You don't need extra parens around &&. You are right! I will fix it up and re-send. Mruali > >> 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))) > > Likewise. > > WBR, Sergei > -- Murali Karicheri Linux Kernel, Texas Instruments -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/