From: Mike McCormack Date: Mon, 31 Jan 2011 13:10:38 +0000 (+0900) Subject: Staging: rtl8192e: Move static variable to device struct X-Git-Tag: firefly_0821_release~7613^2~2197^2~748 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=83184e692826975c296aa0f5ed18d3809b2d1630;p=firefly-linux-kernel-4.4.55.git Staging: rtl8192e: Move static variable to device struct Signed-off-by: Mike McCormack Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index a8b69d3960ae..a63a2a5633f9 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -864,6 +864,7 @@ typedef struct r8192_priv struct Stats stats; struct iw_statistics wstats; struct proc_dir_entry *dir_dev; + struct ieee80211_rx_stats previous_stats; /* RX stuff */ struct sk_buff_head skb_queue; diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index bb86f93c0086..1958e73bf441 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -5258,7 +5258,6 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev, struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); bool bpacket_match_bssid, bpacket_toself; bool bPacketBeacon=false, bToSelfBA=false; - static struct ieee80211_rx_stats previous_stats; struct ieee80211_hdr_3addr *hdr; u16 fc,type; @@ -5298,10 +5297,10 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev, // // Because phy information is contained in the last packet of AMPDU only, so driver // should process phy information of previous packet - rtl8192_process_phyinfo(priv, tmp_buf,&previous_stats, pstats); - rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, &previous_stats, bpacket_match_bssid, + rtl8192_process_phyinfo(priv, tmp_buf, &priv->previous_stats, pstats); + rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, &priv->previous_stats, bpacket_match_bssid, bpacket_toself ,bPacketBeacon, bToSelfBA); - rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats); + rtl8192_record_rxdesc_forlateruse(pstats, &priv->previous_stats); }