From 9eb4e5c5e01be4dd03c86a0cca4d7c8289121a31 Mon Sep 17 00:00:00 2001
From: Claudiu Manoil <claudiu.manoil@freescale.com>
Date: Wed, 23 Jan 2013 00:18:36 +0000
Subject: [PATCH] --- yaml --- r: 351584 b: refs/heads/master c:
 f5ae62799a31fb2ce8b272bf184688e2a4770d19 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/ethernet/freescale/gianfar.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0778adfa203e..e22830e1a6b2 100644
--- 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
index bffb2edd6858..e765b9b49a20 100644
--- 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;