---

yaml --- r: 351584 b: refs/heads/master c: f5ae627 h: refs/heads/master v: v3
git-mirror · Jan 23, 2013 · 9eb4e5c · 9eb4e5c
1 parent 1effa1a
commit 9eb4e5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c617f398edd4db2b8567a28e899a88f8f574798d
+refs/heads/master: f5ae62799a31fb2ce8b272bf184688e2a4770d19
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -355,6 +355,10 @@ static void gfar_init_mac(struct net_device *ndev)
 		gfar_write(&regs->rir0, DEFAULT_RIR0);
 	}
 
+	/* Restore PROMISC mode */
+	if (ndev->flags & IFF_PROMISC)
+		rctrl |= RCTRL_PROM;
+
 	if (ndev->features & NETIF_F_RXCSUM)
 		rctrl |= RCTRL_CHECKSUMMING;