This patch renames u32SetCfgFlag of struct cfg_param_val to flag to
avoid CamelCase naming convention.
Signed-off-by: Tony Cho <tony....@atmel.com>
---
drivers/staging/wilc1000/host_interface.c | 36 +++++++++++------------
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +++----
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 0d4b076..67b7f0b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -846,7 +846,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Setting CFG params\n");
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & BSS_TYPE) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & BSS_TYPE) {
/*----------------------------------------------------------*/
/*Input Value: INFRASTRUCTURE = 1,
*/
/* INDEPENDENT= 2,
*/
@@ -866,7 +866,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & AUTH_TYPE) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & AUTH_TYPE) {
/*------------------------------------------------------*/
/*Input Values: OPEN_SYSTEM = 0,
*/
/* SHARED_KEY = 1,
*/
@@ -886,7 +886,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
AUTHEN_TIMEOUT) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & AUTHEN_TIMEOUT) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->cfg_attr_info.auth_timeout > 0 &&
strHostIFCfgParamAttr->cfg_attr_info.auth_timeout < 65536) {
strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT;
@@ -901,7 +901,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
POWER_MANAGEMENT) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & POWER_MANAGEMENT) {
/*-----------------------------------------------------------*/
/*Input Values: NO_POWERSAVE = 0,
*/
/* MIN_FAST_PS = 1,
*/
@@ -922,7 +922,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & RETRY_SHORT) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & RETRY_SHORT) {
/* range from 1 to 256 */
if ((strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit >
0) && (strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit < 256)) {
strWIDList[u8WidCnt].id = WID_SHORT_RETRY_LIMIT;
@@ -937,7 +937,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & RETRY_LONG) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & RETRY_LONG) {
/* range from 1 to 256 */
if ((strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit > 0)
&& (strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit < 256)) {
strWIDList[u8WidCnt].id = WID_LONG_RETRY_LIMIT;
@@ -953,7 +953,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
FRAG_THRESHOLD) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & FRAG_THRESHOLD) {
if (strHostIFCfgParamAttr->cfg_attr_info.frag_threshold > 255
&& strHostIFCfgParamAttr->cfg_attr_info.frag_threshold < 7937) {
strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD;
@@ -968,7 +968,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & RTS_THRESHOLD)
{
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & RTS_THRESHOLD) {
/* range 256 to 65535 */
if (strHostIFCfgParamAttr->cfg_attr_info.rts_threshold > 255 &&
strHostIFCfgParamAttr->cfg_attr_info.rts_threshold < 65536) {
strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD;
@@ -983,7 +983,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & PREAMBLE) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & PREAMBLE) {
/*-----------------------------------------------------*/
/*Input Values: Short= 0,
*/
/* Long= 1,
*/
@@ -1002,7 +1002,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
SHORT_SLOT_ALLOWED) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & SHORT_SLOT_ALLOWED) {
if (strHostIFCfgParamAttr->cfg_attr_info.short_slot_allowed <
2) {
strWIDList[u8WidCnt].id = WID_SHORT_SLOT_ALLOWED;
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.short_slot_allowed;
@@ -1016,7 +1016,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
TXOP_PROT_DISABLE) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & TXOP_PROT_DISABLE) {
/*Description: used to Disable RTS-CTS protection for TXOP
burst*/
/*transmission when the acknowledgement policy is No-Ack or
Block-Ack */
/* this information is useful for external supplicant
*/
@@ -1034,7 +1034,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
BEACON_INTERVAL) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & BEACON_INTERVAL) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->cfg_attr_info.beacon_interval > 0 &&
strHostIFCfgParamAttr->cfg_attr_info.beacon_interval < 65536) {
strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL;
@@ -1049,7 +1049,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & DTIM_PERIOD) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & DTIM_PERIOD) {
/* range is 1 to 255. */
if (strHostIFCfgParamAttr->cfg_attr_info.dtim_period > 0 &&
strHostIFCfgParamAttr->cfg_attr_info.dtim_period < 256) {
strWIDList[u8WidCnt].id = WID_DTIM_PERIOD;
@@ -1064,7 +1064,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag & SITE_SURVEY) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & SITE_SURVEY) {
/*----------------------------------------------------------------------*/
/*Input Values: SITE_SURVEY_1CH = 0, i.e.: currently set
channel */
/* SITE_SURVEY_ALL_CH = 1,
*/
@@ -1083,7 +1083,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
SITE_SURVEY_SCAN_TIME) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & SITE_SURVEY_SCAN_TIME) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->cfg_attr_info.site_survey_scan_time
> 0 && strHostIFCfgParamAttr->cfg_attr_info.site_survey_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_SITE_SURVEY_SCAN_TIME;
@@ -1098,7 +1098,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
ACTIVE_SCANTIME) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & ACTIVE_SCANTIME) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->cfg_attr_info.active_scan_time > 0
&& strHostIFCfgParamAttr->cfg_attr_info.active_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_ACTIVE_SCAN_TIME;
@@ -1113,7 +1113,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
PASSIVE_SCANTIME) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & PASSIVE_SCANTIME) {
/* range is 1 to 65535. */
if (strHostIFCfgParamAttr->cfg_attr_info.passive_scan_time > 0
&& strHostIFCfgParamAttr->cfg_attr_info.passive_scan_time < 65536) {
strWIDList[u8WidCnt].id = WID_PASSIVE_SCAN_TIME;
@@ -1128,7 +1128,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
}
u8WidCnt++;
}
- if (strHostIFCfgParamAttr->cfg_attr_info.u32SetCfgFlag &
CURRENT_TX_RATE) {
+ if (strHostIFCfgParamAttr->cfg_attr_info.flag & CURRENT_TX_RATE) {
enum CURRENT_TXRATE curr_tx_rate =
strHostIFCfgParamAttr->cfg_attr_info.curr_tx_rate;
/*----------------------------------------------------------------------*/
/*Rates: 1 2 5.5 11 6 9 12 18 24 36
48 54 Auto */
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index f9b5362..e9cee20 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -102,7 +102,7 @@ enum CURRENT_TXRATE {
};
struct cfg_param_val {
- u32 u32SetCfgFlag;
+ u32 flag;
u8 ht_enable;
u8 bss_type;
u8 auth_type;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 2ad08a7..98229da 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1649,25 +1649,25 @@ static int set_wiphy_params(struct wiphy *wiphy, u32
changed)
priv = wiphy_priv(wiphy);
- pstrCfgParamVal.u32SetCfgFlag = 0;
+ pstrCfgParamVal.flag = 0;
PRINT_D(CFG80211_DBG, "Setting Wiphy params\n");
if (changed & WIPHY_PARAM_RETRY_SHORT) {
PRINT_D(CFG80211_DBG, "Setting WIPHY_PARAM_RETRY_SHORT %d\n",
priv->dev->ieee80211_ptr->wiphy->retry_short);
- pstrCfgParamVal.u32SetCfgFlag |= RETRY_SHORT;
+ pstrCfgParamVal.flag |= RETRY_SHORT;
pstrCfgParamVal.short_retry_limit =
priv->dev->ieee80211_ptr->wiphy->retry_short;
}
if (changed & WIPHY_PARAM_RETRY_LONG) {
PRINT_D(CFG80211_DBG, "Setting WIPHY_PARAM_RETRY_LONG %d\n",
priv->dev->ieee80211_ptr->wiphy->retry_long);
- pstrCfgParamVal.u32SetCfgFlag |= RETRY_LONG;
+ pstrCfgParamVal.flag |= RETRY_LONG;
pstrCfgParamVal.long_retry_limit =
priv->dev->ieee80211_ptr->wiphy->retry_long;
}
if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {
PRINT_D(CFG80211_DBG, "Setting WIPHY_PARAM_FRAG_THRESHOLD
%d\n", priv->dev->ieee80211_ptr->wiphy->frag_threshold);
- pstrCfgParamVal.u32SetCfgFlag |= FRAG_THRESHOLD;
+ pstrCfgParamVal.flag |= FRAG_THRESHOLD;
pstrCfgParamVal.frag_threshold =
priv->dev->ieee80211_ptr->wiphy->frag_threshold;
}
@@ -1675,7 +1675,7 @@ static int set_wiphy_params(struct wiphy *wiphy, u32
changed)
if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
PRINT_D(CFG80211_DBG, "Setting WIPHY_PARAM_RTS_THRESHOLD %d\n",
priv->dev->ieee80211_ptr->wiphy->rts_threshold);
- pstrCfgParamVal.u32SetCfgFlag |= RTS_THRESHOLD;
+ pstrCfgParamVal.flag |= RTS_THRESHOLD;
pstrCfgParamVal.rts_threshold =
priv->dev->ieee80211_ptr->wiphy->rts_threshold;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
