From c0d307e266beb2f26f2e74419d790bf8bdef9c50 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Tue, 22 Nov 2011 17:21:46 -0800
Subject: [PATCH] --- yaml --- r: 278397 b: refs/heads/master c:
 0c094c77ce9c338adc08d6d71b2d92a7761992b8 h: refs/heads/master i:   278395:
 51b3fd8032606e08f0893741481e9e2464cd1968 v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61024b512e3b..26c762b381fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52dd17d20be1fb6a111468f3ca8bfa0af7c0903
+refs/heads/master: 0c094c77ce9c338adc08d6d71b2d92a7761992b8
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 7af14138c5db..62413e861784 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -431,6 +431,12 @@ void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx,
 		if (ifp == NULL)
 			ifp = drvr_priv->iflist[0];
 
+		if (!ifp || !ifp->ndev ||
+		    ifp->ndev->reg_state != NETREG_REGISTERED) {
+			brcmu_pkt_buf_free_skb(skb);
+			continue;
+		}
+
 		skb->dev = ifp->ndev;
 		skb->protocol = eth_type_trans(skb, skb->dev);