aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-08 10:38:37 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 18:46:25 -0500
commit9633608f5945629bee9f47190c072fab3ac9b719 (patch)
treef0da9e414ebe8e4cdcacf768d519e7e46ac559f1 /drivers/staging/rtl8192e
parent762bf6dedd7159ea0b6c8150e342b6299e6dd39b (diff)
staging: rtl8192e: Pass priv to TranslateRxSignalStuff819xpci
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.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index d92a565f644..f4d76314a0c 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -4266,14 +4266,13 @@ rtl8192_record_rxdesc_forlateruse(
4266 4266
4267 4267
4268 4268
4269static void TranslateRxSignalStuff819xpci(struct net_device *dev, 4269static void TranslateRxSignalStuff819xpci(struct r8192_priv *priv,
4270 struct sk_buff *skb, 4270 struct sk_buff *skb,
4271 struct ieee80211_rx_stats * pstats, 4271 struct ieee80211_rx_stats * pstats,
4272 prx_desc_819x_pci pdesc, 4272 prx_desc_819x_pci pdesc,
4273 prx_fwinfo_819x_pci pdrvinfo) 4273 prx_fwinfo_819x_pci pdrvinfo)
4274{ 4274{
4275 // TODO: We must only check packet for current MAC address. Not finish 4275 // TODO: We must only check packet for current MAC address. Not finish
4276 struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
4277 bool bpacket_match_bssid, bpacket_toself; 4276 bool bpacket_match_bssid, bpacket_toself;
4278 bool bPacketBeacon=false, bToSelfBA=false; 4277 bool bPacketBeacon=false, bToSelfBA=false;
4279 struct ieee80211_hdr_3addr *hdr; 4278 struct ieee80211_hdr_3addr *hdr;
@@ -4304,7 +4303,7 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev,
4304 } 4303 }
4305 if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK) 4304 if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK)
4306 { 4305 {
4307 if((!compare_ether_addr(praddr,dev->dev_addr))) 4306 if (!compare_ether_addr(praddr, priv->ieee80211->dev->dev_addr))
4308 bToSelfBA = true; 4307 bToSelfBA = true;
4309 } 4308 }
4310 4309
@@ -4505,7 +4504,7 @@ static void rtl8192_rx(struct net_device *dev)
4505 stats.RxIs40MHzPacket = pDrvInfo->BW; 4504 stats.RxIs40MHzPacket = pDrvInfo->BW;
4506 4505
4507 /* ???? */ 4506 /* ???? */
4508 TranslateRxSignalStuff819xpci(dev,skb, &stats, pdesc, pDrvInfo); 4507 TranslateRxSignalStuff819xpci(priv, skb, &stats, pdesc, pDrvInfo);
4509 4508
4510 /* Rx A-MPDU */ 4509 /* Rx A-MPDU */
4511 if(pDrvInfo->FirstAGGR==1 || pDrvInfo->PartAggr == 1) 4510 if(pDrvInfo->FirstAGGR==1 || pDrvInfo->PartAggr == 1)