summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-19 00:09:03 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-24 01:43:59 -0500
commit9be6f10ed3867b1b89c34e4cd3cb5c00c0bc5282 (patch)
treed923f475ad67761a2585973c7469da4b31dd8135
parentdca0eb1e15fa7cf1f4e5fae3d2c32512e24f1742 (diff)
downloadop-kernel-dev-9be6f10ed3867b1b89c34e4cd3cb5c00c0bc5282.zip
op-kernel-dev-9be6f10ed3867b1b89c34e4cd3cb5c00c0bc5282.tar.gz
staging: rtl8192e: Convert typedef rate_adaptive to struct rate_adaptive
Remove typedef from struct. Rename struct. Rename uses. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-rw-r--r--drivers/staging/rtl8192e/rtl_core.h2
-rw-r--r--drivers/staging/rtl8192e/rtl_dm.c6
-rw-r--r--drivers/staging/rtl8192e/rtllib.h5
3 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index 705ccde..2747f0d 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -594,7 +594,7 @@ typedef struct r8192_priv
IC_INFERIORITY_8192S IC_Class;
HT_CHANNEL_WIDTH CurrentChannelBW;
struct bb_reg_definition PHYRegDef[4];
- rate_adaptive rate_adaptive;
+ struct rate_adaptive rate_adaptive;
struct ccktxbbgain cck_txbbgain_table[CCKTxBBGainTableLength];
struct ccktxbbgain cck_txbbgain_ch14_table[CCKTxBBGainTableLength];
diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl_dm.c
index 91edd46..ecd8177 100644
--- a/drivers/staging/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl_dm.c
@@ -251,7 +251,7 @@ extern void init_rate_adaptive(struct net_device * dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
- prate_adaptive pra = (prate_adaptive)&priv->rate_adaptive;
+ struct rate_adaptive *pra = (struct rate_adaptive *)&priv->rate_adaptive;
pra->ratr_state = DM_RATR_STA_MAX;
pra->high2low_rssi_thresh_for_ra = RateAdaptiveTH_High;
@@ -295,7 +295,7 @@ static void dm_check_rate_adaptive(struct net_device * dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;
- prate_adaptive pra = (prate_adaptive)&priv->rate_adaptive;
+ struct rate_adaptive *pra = (struct rate_adaptive *)&priv->rate_adaptive;
u32 currentRATR, targetRATR = 0;
u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
bool bshort_gi_enabled = false;
@@ -1801,7 +1801,7 @@ dm_change_rxpath_selection_setting(
s32 DM_Value)
{
struct r8192_priv *priv = rtllib_priv(dev);
- prate_adaptive pRA = (prate_adaptive)&(priv->rate_adaptive);
+ struct rate_adaptive *pRA = (struct rate_adaptive *)&(priv->rate_adaptive);
if (DM_Type == 0)
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index c06185c..20c91e4 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -2015,8 +2015,7 @@ struct sw_cam_table {
};//,*struct sw_cam_table *;
#define TOTAL_CAM_ENTRY 32
-typedef struct _rate_adaptive
-{
+struct rate_adaptive {
u8 rate_adaptive_disabled;
u8 ratr_state;
u16 reserve;
@@ -2038,7 +2037,7 @@ typedef struct _rate_adaptive
u32 last_ratr;
u8 PreRATRState;
-} rate_adaptive, *prate_adaptive;
+};
typedef enum _RATR_TABLE_MODE_8192S{
RATR_INX_WIRELESS_NGB = 0,
RATR_INX_WIRELESS_NG = 1,
OpenPOWER on IntegriCloud