---

yaml --- r: 233848 b: refs/heads/master c: 0a5f384 h: refs/heads/master v: v3
git-mirror · Feb 28, 2011 · ca4d68d · ca4d68d
1 parent f9521e6
commit ca4d68d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}