aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ath6kl/wlan
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-02-02 17:05:47 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-02 17:34:49 -0500
commit1071a134d0822663f497a1dda4866cffa7df4e36 (patch)
tree8a533bd3f4f9b7571a089825b5c9bb7ee020d8fd /drivers/staging/ath6kl/wlan
parent949c3676cd6b2717c2abda5d9b10e6d6d7daf741 (diff)
staging: ath6kl: Remove A_BOOL and TRUE/FALSE
Use kernel bool and true/false. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl/wlan')
-rw-r--r--drivers/staging/ath6kl/wlan/src/wlan_node.c20
-rw-r--r--drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c4
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c
index 6ec4e48eb2f..4cc45c08715 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_node.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c
@@ -151,7 +151,7 @@ wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
151#ifdef THREAD_X 151#ifdef THREAD_X
152 if (!nt->isTimerArmed) { 152 if (!nt->isTimerArmed) {
153 A_TIMEOUT_MS(&nt->nt_inact_timer, timeoutValue, 0); 153 A_TIMEOUT_MS(&nt->nt_inact_timer, timeoutValue, 0);
154 nt->isTimerArmed = TRUE; 154 nt->isTimerArmed = true;
155 } 155 }
156#endif 156#endif
157 157
@@ -299,7 +299,7 @@ wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt)
299 299
300#ifdef THREAD_X 300#ifdef THREAD_X
301 A_INIT_TIMER(&nt->nt_inact_timer, wlan_node_timeout, nt); 301 A_INIT_TIMER(&nt->nt_inact_timer, wlan_node_timeout, nt);
302 nt->isTimerArmed = FALSE; 302 nt->isTimerArmed = false;
303#endif 303#endif
304 nt->nt_wmip = wmip; 304 nt->nt_wmip = wmip;
305 nt->nt_nodeAge = WLAN_NODE_INACT_TIMEOUT_MSEC; 305 nt->nt_nodeAge = WLAN_NODE_INACT_TIMEOUT_MSEC;
@@ -326,7 +326,7 @@ wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt)
326{ 326{
327#ifdef THREAD_X 327#ifdef THREAD_X
328 bss_t *bss, *nextBss; 328 bss_t *bss, *nextBss;
329 A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = FALSE; 329 A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = false;
330 330
331 wmi_get_current_bssid(nt->nt_wmip, myBssid); 331 wmi_get_current_bssid(nt->nt_wmip, myBssid);
332 332
@@ -379,7 +379,7 @@ wlan_node_timeout (A_ATH_TIMER arg)
379{ 379{
380 struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg; 380 struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg;
381 bss_t *bss, *nextBss; 381 bss_t *bss, *nextBss;
382 A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = FALSE; 382 A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = false;
383 A_UINT32 timeoutValue = 0; 383 A_UINT32 timeoutValue = 0;
384 384
385 timeoutValue = nt->nt_nodeAge; 385 timeoutValue = nt->nt_nodeAge;
@@ -406,7 +406,7 @@ wlan_node_timeout (A_ATH_TIMER arg)
406 * Re-arm timer, only when we have a bss other than 406 * Re-arm timer, only when we have a bss other than
407 * current bss AND it is not aged-out. 407 * current bss AND it is not aged-out.
408 */ 408 */
409 reArmTimer = TRUE; 409 reArmTimer = true;
410 } 410 }
411 } 411 }
412 bss = nextBss; 412 bss = nextBss;
@@ -432,7 +432,7 @@ wlan_node_table_cleanup(struct ieee80211_node_table *nt)
432 432
433bss_t * 433bss_t *
434wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid, 434wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
435 A_UINT32 ssidLength, A_BOOL bIsWPA2, A_BOOL bMatchSSID) 435 A_UINT32 ssidLength, bool bIsWPA2, bool bMatchSSID)
436{ 436{
437 bss_t *ni = NULL; 437 bss_t *ni = NULL;
438 A_UCHAR *pIESsid = NULL; 438 A_UCHAR *pIESsid = NULL;
@@ -447,22 +447,22 @@ wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
447 if (0x00 == memcmp (pSsid, &pIESsid[2], ssidLength)) { 447 if (0x00 == memcmp (pSsid, &pIESsid[2], ssidLength)) {
448 448
449 // 449 //
450 // Step 2.1 : Check MatchSSID is TRUE, if so, return Matched SSID 450 // Step 2.1 : Check MatchSSID is true, if so, return Matched SSID
451 // Profile, otherwise check whether WPA2 or WPA 451 // Profile, otherwise check whether WPA2 or WPA
452 // 452 //
453 if (TRUE == bMatchSSID) { 453 if (true == bMatchSSID) {
454 ieee80211_node_incref (ni); /* mark referenced */ 454 ieee80211_node_incref (ni); /* mark referenced */
455 IEEE80211_NODE_UNLOCK (nt); 455 IEEE80211_NODE_UNLOCK (nt);
456 return ni; 456 return ni;
457 } 457 }
458 458
459 // Step 2 : if SSID matches, check WPA or WPA2 459 // Step 2 : if SSID matches, check WPA or WPA2
460 if (TRUE == bIsWPA2 && NULL != ni->ni_cie.ie_rsn) { 460 if (true == bIsWPA2 && NULL != ni->ni_cie.ie_rsn) {
461 ieee80211_node_incref (ni); /* mark referenced */ 461 ieee80211_node_incref (ni); /* mark referenced */
462 IEEE80211_NODE_UNLOCK (nt); 462 IEEE80211_NODE_UNLOCK (nt);
463 return ni; 463 return ni;
464 } 464 }
465 if (FALSE == bIsWPA2 && NULL != ni->ni_cie.ie_wpa) { 465 if (false == bIsWPA2 && NULL != ni->ni_cie.ie_wpa) {
466 ieee80211_node_incref(ni); /* mark referenced */ 466 ieee80211_node_incref(ni); /* mark referenced */
467 IEEE80211_NODE_UNLOCK (nt); 467 IEEE80211_NODE_UNLOCK (nt);
468 return ni; 468 return ni;
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
index 2743c4cf604..e9346bfe0dc 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c
@@ -101,7 +101,7 @@ int
101wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie) 101wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie)
102{ 102{
103 A_UINT8 *frm, *efrm; 103 A_UINT8 *frm, *efrm;
104 A_UINT8 elemid_ssid = FALSE; 104 A_UINT8 elemid_ssid = false;
105 105
106 frm = buf; 106 frm = buf;
107 efrm = (A_UINT8 *) (frm + framelen); 107 efrm = (A_UINT8 *) (frm + framelen);
@@ -134,7 +134,7 @@ wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie)
134 case IEEE80211_ELEMID_SSID: 134 case IEEE80211_ELEMID_SSID:
135 if (!elemid_ssid) { 135 if (!elemid_ssid) {
136 cie->ie_ssid = frm; 136 cie->ie_ssid = frm;
137 elemid_ssid = TRUE; 137 elemid_ssid = true;
138 } 138 }
139 break; 139 break;
140 case IEEE80211_ELEMID_RATES: 140 case IEEE80211_ELEMID_RATES: