Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236329
b: refs/heads/master
c: 9633608
h: refs/heads/master
i:
  236327: e607e8e
v: v3
  • Loading branch information
Mike McCormack authored and Greg Kroah-Hartman committed Mar 9, 2011
1 parent 7632890 commit e63edcc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 762bf6dedd7159ea0b6c8150e342b6299e6dd39b
refs/heads/master: 9633608f5945629bee9f47190c072fab3ac9b719
7 changes: 3 additions & 4 deletions trunk/drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4266,14 +4266,13 @@ rtl8192_record_rxdesc_forlateruse(



static void TranslateRxSignalStuff819xpci(struct net_device *dev,
static void TranslateRxSignalStuff819xpci(struct r8192_priv *priv,
struct sk_buff *skb,
struct ieee80211_rx_stats * pstats,
prx_desc_819x_pci pdesc,
prx_fwinfo_819x_pci pdrvinfo)
{
// TODO: We must only check packet for current MAC address. Not finish
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
bool bpacket_match_bssid, bpacket_toself;
bool bPacketBeacon=false, bToSelfBA=false;
struct ieee80211_hdr_3addr *hdr;
Expand Down Expand Up @@ -4304,7 +4303,7 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev,
}
if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK)
{
if((!compare_ether_addr(praddr,dev->dev_addr)))
if (!compare_ether_addr(praddr, priv->ieee80211->dev->dev_addr))
bToSelfBA = true;
}

Expand Down Expand Up @@ -4505,7 +4504,7 @@ static void rtl8192_rx(struct net_device *dev)
stats.RxIs40MHzPacket = pDrvInfo->BW;

/* ???? */
TranslateRxSignalStuff819xpci(dev,skb, &stats, pdesc, pDrvInfo);
TranslateRxSignalStuff819xpci(priv, skb, &stats, pdesc, pDrvInfo);

/* Rx A-MPDU */
if(pDrvInfo->FirstAGGR==1 || pDrvInfo->PartAggr == 1)
Expand Down

0 comments on commit e63edcc

Please sign in to comment.