Commit cb64de7c authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: renames pJoinParams of connect_resp_info structure

This patch renames pJoinParams variable to join_params.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 390b6db0
...@@ -92,7 +92,7 @@ struct network_info { ...@@ -92,7 +92,7 @@ struct network_info {
u32 tsf_lo; u32 tsf_lo;
u8 *ies; u8 *ies;
u16 ies_len; u16 ies_len;
void *pJoinParams; void *join_params;
tstrRSSI strRssi; tstrRSSI strRssi;
u64 u64Tsf; u64 u64Tsf;
}; };
......
...@@ -199,8 +199,8 @@ static void clear_shadow_scan(void) ...@@ -199,8 +199,8 @@ static void clear_shadow_scan(void)
last_scanned_shadow[last_scanned_cnt].ies = NULL; last_scanned_shadow[last_scanned_cnt].ies = NULL;
} }
kfree(last_scanned_shadow[i].pJoinParams); kfree(last_scanned_shadow[i].join_params);
last_scanned_shadow[i].pJoinParams = NULL; last_scanned_shadow[i].join_params = NULL;
} }
last_scanned_cnt = 0; last_scanned_cnt = 0;
} }
...@@ -295,7 +295,7 @@ static void remove_network_from_shadow(unsigned long arg) ...@@ -295,7 +295,7 @@ static void remove_network_from_shadow(unsigned long arg)
kfree(last_scanned_shadow[i].ies); kfree(last_scanned_shadow[i].ies);
last_scanned_shadow[i].ies = NULL; last_scanned_shadow[i].ies = NULL;
kfree(last_scanned_shadow[i].pJoinParams); kfree(last_scanned_shadow[i].join_params);
for (j = i; (j < last_scanned_cnt - 1); j++) for (j = i; (j < last_scanned_cnt - 1); j++)
last_scanned_shadow[j] = last_scanned_shadow[j + 1]; last_scanned_shadow[j] = last_scanned_shadow[j + 1];
...@@ -389,8 +389,8 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, ...@@ -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].time_scan_cached = jiffies;
last_scanned_shadow[ap_index].found = 1; last_scanned_shadow[ap_index].found = 1;
if (ap_found != -1) if (ap_found != -1)
kfree(last_scanned_shadow[ap_index].pJoinParams); kfree(last_scanned_shadow[ap_index].join_params);
last_scanned_shadow[ap_index].pJoinParams = pJoinParams; last_scanned_shadow[ap_index].join_params = pJoinParams;
} }
static void CfgScanResult(enum scan_event scan_event, static void CfgScanResult(enum scan_event scan_event,
...@@ -913,7 +913,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -913,7 +913,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
CfgConnectResult, (void *)priv, CfgConnectResult, (void *)priv,
u8security, tenuAuth_type, u8security, tenuAuth_type,
pstrNetworkInfo->ch, pstrNetworkInfo->ch,
pstrNetworkInfo->pJoinParams); pstrNetworkInfo->join_params);
if (s32Error != 0) { if (s32Error != 0) {
netdev_err(dev, "wilc_set_join_req(): Error\n"); netdev_err(dev, "wilc_set_join_req(): Error\n");
s32Error = -ENOENT; s32Error = -ENOENT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment