From bf729a6576cab4df06371fab02220771203b1326 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Wed, 9 Mar 2011 00:40:44 +0900
Subject: [PATCH] --- yaml --- r: 236340 b: refs/heads/master c:
 ddd877b2e19de8c73d67b57f9a117b51e8ddfec8 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rtl8192e/r8192E_core.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5a78f1437d54..5be7ccc6029d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c62fdce2f78b7571e83954bb0aaabdd0e6880a82
+refs/heads/master: ddd877b2e19de8c73d67b57f9a117b51e8ddfec8
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
index f742eb2628dc..a3fcbae8365c 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_core.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -4418,9 +4418,8 @@ static void UpdateReceivedRateHistogramStatistics8190(
 	priv->stats.received_rate_histogram[rcvType][rateIndex]++;
 }
 
-static void rtl8192_rx(struct net_device *dev)
+static void rtl8192_rx(struct r8192_priv *priv)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
     struct ieee80211_hdr_1addr *ieee80211_hdr = NULL;
     bool unicast_packet = false;
     struct ieee80211_rx_stats stats = {
@@ -4551,7 +4550,7 @@ static void rtl8192_rx(struct net_device *dev)
 static void rtl8192_irq_rx_tasklet(unsigned long arg)
 {
 	struct r8192_priv *priv = (struct r8192_priv*) arg;
-       rtl8192_rx(priv->ieee80211->dev);
+	rtl8192_rx(priv);
 	/* unmask RDU */
        write_nic_dword(priv, INTA_MASK, read_nic_dword(priv, INTA_MASK) | IMR_RDU);
 }