This patch renames pJoinParams variable to join_params.
Signed-off-by: Leo Kim <[email protected]>
---
drivers/staging/wilc1000/coreconfigurator.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.h
b/drivers/staging/wilc1000/coreconfigurator.h
index 3dca840..f154e39 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -92,7 +92,7 @@ struct network_info {
u32 tsf_lo;
u8 *ies;
u16 ies_len;
- void *pJoinParams;
+ void *join_params;
tstrRSSI strRssi;
u64 u64Tsf;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index fafe63c..ef4a994 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -199,8 +199,8 @@ static void clear_shadow_scan(void)
last_scanned_shadow[last_scanned_cnt].ies =
NULL;
}
-
wilc_free_join_params(last_scanned_shadow[i].pJoinParams);
- last_scanned_shadow[i].pJoinParams = NULL;
+
wilc_free_join_params(last_scanned_shadow[i].join_params);
+ last_scanned_shadow[i].join_params = NULL;
}
last_scanned_cnt = 0;
}
@@ -295,7 +295,7 @@ static void remove_network_from_shadow(unsigned long arg)
kfree(last_scanned_shadow[i].ies);
last_scanned_shadow[i].ies = NULL;
-
wilc_free_join_params(last_scanned_shadow[i].pJoinParams);
+
wilc_free_join_params(last_scanned_shadow[i].join_params);
for (j = i; (j < last_scanned_cnt - 1); j++)
last_scanned_shadow[j] = last_scanned_shadow[j
+ 1];
@@ -389,8 +389,8 @@ static void add_network_to_shadow(struct network_info
*pstrNetworkInfo,
last_scanned_shadow[ap_index].time_scan_cached = jiffies;
last_scanned_shadow[ap_index].found = 1;
if (ap_found != -1)
-
wilc_free_join_params(last_scanned_shadow[ap_index].pJoinParams);
- last_scanned_shadow[ap_index].pJoinParams = pJoinParams;
+
wilc_free_join_params(last_scanned_shadow[ap_index].join_params);
+ last_scanned_shadow[ap_index].join_params = pJoinParams;
}
static void CfgScanResult(enum scan_event scan_event,
@@ -913,7 +913,7 @@ static int connect(struct wiphy *wiphy, struct net_device
*dev,
CfgConnectResult, (void *)priv,
u8security, tenuAuth_type,
pstrNetworkInfo->ch,
- pstrNetworkInfo->pJoinParams);
+ pstrNetworkInfo->join_params);
if (s32Error != 0) {
netdev_err(dev, "wilc_set_join_req(): Error\n");
s32Error = -ENOENT;
--
1.9.1
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
