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

staging: wilc1000: renames struct connect_resp_info variables

This patch renames to avoid camelcase changes follow are:
 - u32TimeRcvdInScanCached to time_scan_cached
 - u32TimeRcvdInScan to time_scan
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 405a8c78
...@@ -85,8 +85,8 @@ struct network_info { ...@@ -85,8 +85,8 @@ struct network_info {
u16 beacon_period; u16 beacon_period;
u8 dtim_period; u8 dtim_period;
u8 ch; u8 ch;
unsigned long u32TimeRcvdInScanCached; unsigned long time_scan_cached;
unsigned long u32TimeRcvdInScan; unsigned long time_scan;
bool bNewNetwork; bool bNewNetwork;
u8 u8Found; u8 u8Found;
u32 u32Tsf; u32 u32Tsf;
......
...@@ -277,7 +277,7 @@ static void update_scan_time(void) ...@@ -277,7 +277,7 @@ static void update_scan_time(void)
int i; int i;
for (i = 0; i < last_scanned_cnt; i++) for (i = 0; i < last_scanned_cnt; i++)
last_scanned_shadow[i].u32TimeRcvdInScan = jiffies; last_scanned_shadow[i].time_scan = jiffies;
} }
static void remove_network_from_shadow(unsigned long arg) static void remove_network_from_shadow(unsigned long arg)
...@@ -287,7 +287,8 @@ static void remove_network_from_shadow(unsigned long arg) ...@@ -287,7 +287,8 @@ static void remove_network_from_shadow(unsigned long arg)
for (i = 0; i < last_scanned_cnt; i++) { for (i = 0; i < last_scanned_cnt; i++) {
if (time_after(now, last_scanned_shadow[i].u32TimeRcvdInScan + (unsigned long)(SCAN_RESULT_EXPIRE))) { if (time_after(now, last_scanned_shadow[i].time_scan +
(unsigned long)(SCAN_RESULT_EXPIRE))) {
PRINT_D(CFG80211_DBG, "Network expired ScanShadow:%s\n", PRINT_D(CFG80211_DBG, "Network expired ScanShadow:%s\n",
last_scanned_shadow[i].ssid); last_scanned_shadow[i].ssid);
...@@ -384,8 +385,8 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo, ...@@ -384,8 +385,8 @@ static void add_network_to_shadow(struct network_info *pstrNetworkInfo,
kmalloc(pstrNetworkInfo->u16IEsLen, GFP_KERNEL); kmalloc(pstrNetworkInfo->u16IEsLen, GFP_KERNEL);
memcpy(last_scanned_shadow[ap_index].pu8IEs, memcpy(last_scanned_shadow[ap_index].pu8IEs,
pstrNetworkInfo->pu8IEs, pstrNetworkInfo->u16IEsLen); pstrNetworkInfo->pu8IEs, pstrNetworkInfo->u16IEsLen);
last_scanned_shadow[ap_index].u32TimeRcvdInScan = jiffies; last_scanned_shadow[ap_index].time_scan = jiffies;
last_scanned_shadow[ap_index].u32TimeRcvdInScanCached = jiffies; last_scanned_shadow[ap_index].time_scan_cached = jiffies;
last_scanned_shadow[ap_index].u8Found = 1; last_scanned_shadow[ap_index].u8Found = 1;
if (ap_found != -1) if (ap_found != -1)
kfree(last_scanned_shadow[ap_index].pJoinParams); kfree(last_scanned_shadow[ap_index].pJoinParams);
...@@ -465,7 +466,7 @@ static void CfgScanResult(enum scan_event scan_event, ...@@ -465,7 +466,7 @@ static void CfgScanResult(enum scan_event scan_event,
PRINT_D(CFG80211_DBG, "Update RSSI of %s\n", last_scanned_shadow[i].ssid); PRINT_D(CFG80211_DBG, "Update RSSI of %s\n", last_scanned_shadow[i].ssid);
last_scanned_shadow[i].rssi = network_info->rssi; last_scanned_shadow[i].rssi = network_info->rssi;
last_scanned_shadow[i].u32TimeRcvdInScan = jiffies; last_scanned_shadow[i].time_scan = jiffies;
break; break;
} }
} }
...@@ -566,9 +567,9 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, ...@@ -566,9 +567,9 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
unsigned long now = jiffies; unsigned long now = jiffies;
if (time_after(now, if (time_after(now,
last_scanned_shadow[i].u32TimeRcvdInScanCached + (unsigned long)(nl80211_SCAN_RESULT_EXPIRE - (1 * HZ)))) { last_scanned_shadow[i].time_scan_cached +
(unsigned long)(nl80211_SCAN_RESULT_EXPIRE - (1 * HZ))))
bNeedScanRefresh = true; bNeedScanRefresh = true;
}
break; break;
} }
......
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