From ca4d68db8235c78622f62343f3944ae0a2ea4e96 Mon Sep 17 00:00:00 2001
From: "Hegde, Vinay" <vinay.hegde@ti.com>
Date: Thu, 24 Feb 2011 23:56:28 +0000
Subject: [PATCH] --- yaml --- r: 233848 b: refs/heads/master c:
 0a5f38467765ee15478db90d81e40c269c8dda20 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/davinci_emac.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ada74e7f4743..7beb71541df7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b746f7e52fe33ce66ea0cf6127838eff507839ff
+refs/heads/master: 0a5f38467765ee15478db90d81e40c269c8dda20
diff --git a/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c
index 2a628d17d178..7018bfe408a4 100644
--- a/trunk/drivers/net/davinci_emac.c
+++ b/trunk/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;
 	}