From: Mike McCormack Date: Tue, 8 Mar 2011 15:40:44 +0000 (+0900) Subject: staging: rtl8192e: Pass priv to rtl8192_rx X-Git-Tag: v2.6.39-rc1~469^2~205 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ddd877b2e19de8c73d67b57f9a117b51e8ddfec8;p=cascardo%2Flinux.git staging: rtl8192e: Pass priv to rtl8192_rx Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index f742eb2628dc..a3fcbae8365c 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/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 @@ done: 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); }