From: Hegde, Vinay <vinay.hegde@ti.com>
Date: Thu, 24 Feb 2011 23:56:28 +0000 (+0000)
Subject: davinci_emac: Add Carrier Link OK check in Davinci RX Handler
X-Git-Tag: v2.6.38-rc8~29^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a5f38467765ee15478db90d81e40c269c8dda20;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

davinci_emac: Add Carrier Link OK check in Davinci RX Handler

This patch adds an additional check in the Davinci EMAC RX Handler,
which tests the __LINK_STATE_NOCARRIER flag along with the
__LINK_STATE_START flag as part EMAC shutting down procedure.

This avoids
WARNING: at drivers/net/davinci_emac.c:1040 emac_rx_handler+0xf8/0x120()
during rtcwake used to suspend the target for a specified duration.

Signed-off-by: Hegde, Vinay <vinay.hegde@ti.com>
Acked-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 2a628d1..7018bfe 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1008,7 +1008,7 @@ static void emac_rx_handler(void *token, int len, int status)
 	int			ret;
 
 	/* free and bail if we are shutting down */
-	if (unlikely(!netif_running(ndev))) {
+	if (unlikely(!netif_running(ndev) || !netif_carrier_ok(ndev))) {
 		dev_kfree_skb_any(skb);
 		return;
 	}