Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236330
b: refs/heads/master
c: e261748
h: refs/heads/master
v: v3
  • Loading branch information
Mike McCormack authored and Greg Kroah-Hartman committed Mar 9, 2011
1 parent e63edcc commit 58daef4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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: 9633608f5945629bee9f47190c072fab3ac9b719
refs/heads/master: e26174864a565bca76657a7a468bc14465822f7c
5 changes: 2 additions & 3 deletions trunk/drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4362,11 +4362,10 @@ static void rtl8192_irq_tx_tasklet(unsigned long arg)

/* Record the received data rate */
static void UpdateReceivedRateHistogramStatistics8190(
struct net_device *dev,
struct r8192_priv *priv,
struct ieee80211_rx_stats* pstats
)
{
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
u32 rcvType=1; //0: Total, 1:OK, 2:CRC, 3:ICV
u32 rateIndex;
u32 preamble_guardinterval; //1: short preamble/GI, 0: long preamble/GI
Expand Down Expand Up @@ -4485,7 +4484,7 @@ static void rtl8192_rx(struct net_device *dev)
/* it is debug only. It should be disabled in released driver.
* 2007.1.11 by Emily
* */
UpdateReceivedRateHistogramStatistics8190(dev, &stats);
UpdateReceivedRateHistogramStatistics8190(priv, &stats);

stats.bIsAMPDU = (pDrvInfo->PartAggr==1);
stats.bFirstMPDU = (pDrvInfo->PartAggr==1) && (pDrvInfo->FirstAGGR==1);
Expand Down

0 comments on commit 58daef4

Please sign in to comment.