aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-08 10:40:44 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 18:46:28 -0500
commitddd877b2e19de8c73d67b57f9a117b51e8ddfec8 (patch)
tree79b1c74e291bb61a0473061f72dfdd21dc851016 /drivers/staging/rtl8192e
parentc62fdce2f78b7571e83954bb0aaabdd0e6880a82 (diff)
staging: rtl8192e: Pass priv to rtl8192_rx
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index f742eb2628d..a3fcbae8365 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -4418,9 +4418,8 @@ static void UpdateReceivedRateHistogramStatistics8190(
4418 priv->stats.received_rate_histogram[rcvType][rateIndex]++; 4418 priv->stats.received_rate_histogram[rcvType][rateIndex]++;
4419} 4419}
4420 4420
4421static void rtl8192_rx(struct net_device *dev) 4421static void rtl8192_rx(struct r8192_priv *priv)
4422{ 4422{
4423 struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
4424 struct ieee80211_hdr_1addr *ieee80211_hdr = NULL; 4423 struct ieee80211_hdr_1addr *ieee80211_hdr = NULL;
4425 bool unicast_packet = false; 4424 bool unicast_packet = false;
4426 struct ieee80211_rx_stats stats = { 4425 struct ieee80211_rx_stats stats = {
@@ -4551,7 +4550,7 @@ done:
4551static void rtl8192_irq_rx_tasklet(unsigned long arg) 4550static void rtl8192_irq_rx_tasklet(unsigned long arg)
4552{ 4551{
4553 struct r8192_priv *priv = (struct r8192_priv*) arg; 4552 struct r8192_priv *priv = (struct r8192_priv*) arg;
4554 rtl8192_rx(priv->ieee80211->dev); 4553 rtl8192_rx(priv);
4555 /* unmask RDU */ 4554 /* unmask RDU */
4556 write_nic_dword(priv, INTA_MASK, read_nic_dword(priv, INTA_MASK) | IMR_RDU); 4555 write_nic_dword(priv, INTA_MASK, read_nic_dword(priv, INTA_MASK) | IMR_RDU);
4557} 4556}