From 7d6d3af1b0b5ffa1c3dfa2f95135a6d94fb747d9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 18 Jul 2011 21:06:43 -0500 Subject: [PATCH] --- yaml --- r: 267735 b: refs/heads/master c: 38b1f67d9dffd8adebf5558d790c7fc5a5b5dc80 h: refs/heads/master i: 267733: f014d9b556d4502d66ca5931693c873c5347c1ae 267731: 316a24e68572c406ab47a84f09d5245d020b62fb 267727: 2668fa2dfbe38ab300fabb17bb4b984750fa3c63 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/rtl819x_HT.h | 4 ++-- trunk/drivers/staging/rtl8192e/rtl_core.h | 2 +- trunk/drivers/staging/rtl8192e/rtl_dm.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d078d868399f..31837bb70ed7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6a15cb8a0aea26f1165876c7ef1db159cb4b229 +refs/heads/master: 38b1f67d9dffd8adebf5558d790c7fc5a5b5dc80 diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h index 4b69c6ec1b16..f85415ff3f15 100644 --- a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h @@ -366,7 +366,7 @@ struct mimo_evm { u32 EVM2; };//, *struct mimo_evm *; -typedef struct _FALSE_ALARM_STATISTICS{ +struct false_alarm_stats { u32 Cnt_Parity_Fail; u32 Cnt_Rate_Illegal; u32 Cnt_Crc8_fail; @@ -374,7 +374,7 @@ typedef struct _FALSE_ALARM_STATISTICS{ u32 Cnt_Ofdm_fail; u32 Cnt_Cck_fail; u32 Cnt_all; -}FALSE_ALARM_STATISTICS, *PFALSE_ALARM_STATISTICS; +};//, *struct false_alarm_stats *; extern u8 MCS_FILTER_ALL[16]; diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index ffbfb290866d..a199cfdc30e7 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -882,7 +882,7 @@ typedef struct r8192_priv u8 DynamicTxHighPowerLvl; u8 LastDTPLvl; u32 CurrentRATR0; - FALSE_ALARM_STATISTICS FalseAlmCnt; + struct false_alarm_stats FalseAlmCnt; u8 DMFlag; u8 DM_Type; diff --git a/trunk/drivers/staging/rtl8192e/rtl_dm.c b/trunk/drivers/staging/rtl8192e/rtl_dm.c index 696e6c260c53..74868b84f044 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_dm.c +++ b/trunk/drivers/staging/rtl8192e/rtl_dm.c @@ -1916,7 +1916,7 @@ void dm_FalseAlarmCounterStatistics(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); u32 ret_value; - PFALSE_ALARM_STATISTICS FalseAlmCnt = &(priv->FalseAlmCnt); + struct false_alarm_stats *FalseAlmCnt = &(priv->FalseAlmCnt); ret_value = rtl8192_QueryBBReg(dev, rOFDM_PHYCounter1, bMaskDWord); FalseAlmCnt->Cnt_Parity_Fail = ((ret_value&0xffff0000)>>16);