diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 13:11:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 13:11:12 -0400 |
commit | 3fd79f7c0b69d100c376ad116733cdb655bb2cf1 (patch) | |
tree | efa0f616175beb3c950f69757c3e2e941a9b556d /drivers/staging/brcm80211/brcmfmac/wl_iw.c | |
parent | 41feb5ede1994e2c851f65dec82790544ed364fd (diff) |
Staging: brcm80211: brcmfmac: s/uint8/u8/
Replace uint8 with u8, the correct kernel type to be using here.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/wl_iw.c')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 4f1201e9992..ed4ba03cfac 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c | |||
@@ -499,7 +499,7 @@ wl_iw_get_range(struct net_device *dev, | |||
499 | int phytype; | 499 | int phytype; |
500 | int bw_cap = 0, sgi_tx = 0, nmode = 0; | 500 | int bw_cap = 0, sgi_tx = 0, nmode = 0; |
501 | channel_info_t ci; | 501 | channel_info_t ci; |
502 | uint8 nrate_list2copy = 0; | 502 | u8 nrate_list2copy = 0; |
503 | uint16 nrate_list[4][8] = { {13, 26, 39, 52, 78, 104, 117, 130}, | 503 | uint16 nrate_list[4][8] = { {13, 26, 39, 52, 78, 104, 117, 130}, |
504 | {14, 29, 43, 58, 87, 116, 130, 144}, | 504 | {14, 29, 43, 58, 87, 116, 130, 144}, |
505 | {27, 54, 81, 108, 162, 216, 243, 270}, | 505 | {27, 54, 81, 108, 162, 216, 243, 270}, |
@@ -1407,10 +1407,10 @@ wl_iw_iscan_set_scan(struct net_device *dev, | |||
1407 | #endif /* WL_IW_USE_ISCAN */ | 1407 | #endif /* WL_IW_USE_ISCAN */ |
1408 | 1408 | ||
1409 | #if WIRELESS_EXT > 17 | 1409 | #if WIRELESS_EXT > 17 |
1410 | static bool ie_is_wpa_ie(uint8 **wpaie, uint8 **tlvs, int *tlvs_len) | 1410 | static bool ie_is_wpa_ie(u8 **wpaie, u8 **tlvs, int *tlvs_len) |
1411 | { | 1411 | { |
1412 | 1412 | ||
1413 | uint8 *ie = *wpaie; | 1413 | u8 *ie = *wpaie; |
1414 | 1414 | ||
1415 | if ((ie[1] >= 6) && | 1415 | if ((ie[1] >= 6) && |
1416 | !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) { | 1416 | !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) { |
@@ -1423,10 +1423,10 @@ static bool ie_is_wpa_ie(uint8 **wpaie, uint8 **tlvs, int *tlvs_len) | |||
1423 | return FALSE; | 1423 | return FALSE; |
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | static bool ie_is_wps_ie(uint8 **wpsie, uint8 **tlvs, int *tlvs_len) | 1426 | static bool ie_is_wps_ie(u8 **wpsie, u8 **tlvs, int *tlvs_len) |
1427 | { | 1427 | { |
1428 | 1428 | ||
1429 | uint8 *ie = *wpsie; | 1429 | u8 *ie = *wpsie; |
1430 | 1430 | ||
1431 | if ((ie[1] >= 4) && | 1431 | if ((ie[1] >= 4) && |
1432 | !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) { | 1432 | !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) { |
@@ -1451,7 +1451,7 @@ wl_iw_handle_scanresults_ies(char **event_p, char *end, | |||
1451 | event = *event_p; | 1451 | event = *event_p; |
1452 | if (bi->ie_length) { | 1452 | if (bi->ie_length) { |
1453 | bcm_tlv_t *ie; | 1453 | bcm_tlv_t *ie; |
1454 | uint8 *ptr = ((uint8 *) bi) + sizeof(wl_bss_info_t); | 1454 | u8 *ptr = ((u8 *) bi) + sizeof(wl_bss_info_t); |
1455 | int ptr_len = bi->ie_length; | 1455 | int ptr_len = bi->ie_length; |
1456 | 1456 | ||
1457 | #ifdef BCMWPA2 | 1457 | #ifdef BCMWPA2 |
@@ -1463,11 +1463,11 @@ wl_iw_handle_scanresults_ies(char **event_p, char *end, | |||
1463 | IWE_STREAM_ADD_POINT(info, event, end, &iwe, | 1463 | IWE_STREAM_ADD_POINT(info, event, end, &iwe, |
1464 | (char *)ie); | 1464 | (char *)ie); |
1465 | } | 1465 | } |
1466 | ptr = ((uint8 *) bi) + sizeof(wl_bss_info_t); | 1466 | ptr = ((u8 *) bi) + sizeof(wl_bss_info_t); |
1467 | #endif | 1467 | #endif |
1468 | 1468 | ||
1469 | while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) { | 1469 | while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) { |
1470 | if (ie_is_wps_ie(((uint8 **)&ie), &ptr, &ptr_len)) { | 1470 | if (ie_is_wps_ie(((u8 **)&ie), &ptr, &ptr_len)) { |
1471 | iwe.cmd = IWEVGENIE; | 1471 | iwe.cmd = IWEVGENIE; |
1472 | iwe.u.data.length = ie->len + 2; | 1472 | iwe.u.data.length = ie->len + 2; |
1473 | event = | 1473 | event = |
@@ -1477,10 +1477,10 @@ wl_iw_handle_scanresults_ies(char **event_p, char *end, | |||
1477 | } | 1477 | } |
1478 | } | 1478 | } |
1479 | 1479 | ||
1480 | ptr = ((uint8 *) bi) + sizeof(wl_bss_info_t); | 1480 | ptr = ((u8 *) bi) + sizeof(wl_bss_info_t); |
1481 | ptr_len = bi->ie_length; | 1481 | ptr_len = bi->ie_length; |
1482 | while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) { | 1482 | while ((ie = bcm_parse_tlvs(ptr, ptr_len, DOT11_MNG_WPA_ID))) { |
1483 | if (ie_is_wpa_ie(((uint8 **)&ie), &ptr, &ptr_len)) { | 1483 | if (ie_is_wpa_ie(((u8 **)&ie), &ptr, &ptr_len)) { |
1484 | iwe.cmd = IWEVGENIE; | 1484 | iwe.cmd = IWEVGENIE; |
1485 | iwe.u.data.length = ie->len + 2; | 1485 | iwe.u.data.length = ie->len + 2; |
1486 | event = | 1486 | event = |
@@ -1743,7 +1743,7 @@ wl_iw_iscan_get_scan(struct net_device *dev, | |||
1743 | iscan_info_t *iscan = g_iscan; | 1743 | iscan_info_t *iscan = g_iscan; |
1744 | iscan_buf_t *p_buf; | 1744 | iscan_buf_t *p_buf; |
1745 | uint32 counter = 0; | 1745 | uint32 counter = 0; |
1746 | uint8 channel; | 1746 | u8 channel; |
1747 | 1747 | ||
1748 | WL_TRACE(("%s %s buflen_from_user %d:\n", dev->name, __func__, | 1748 | WL_TRACE(("%s %s buflen_from_user %d:\n", dev->name, __func__, |
1749 | dwrq->length)); | 1749 | dwrq->length)); |
@@ -2205,7 +2205,7 @@ wl_iw_get_txpow(struct net_device *dev, | |||
2205 | struct iw_param *vwrq, char *extra) | 2205 | struct iw_param *vwrq, char *extra) |
2206 | { | 2206 | { |
2207 | int error, disable, txpwrdbm; | 2207 | int error, disable, txpwrdbm; |
2208 | uint8 result; | 2208 | u8 result; |
2209 | 2209 | ||
2210 | WL_TRACE(("%s: SIOCGIWTXPOW\n", dev->name)); | 2210 | WL_TRACE(("%s: SIOCGIWTXPOW\n", dev->name)); |
2211 | 2211 | ||
@@ -2218,7 +2218,7 @@ wl_iw_get_txpow(struct net_device *dev, | |||
2218 | return error; | 2218 | return error; |
2219 | 2219 | ||
2220 | disable = dtoh32(disable); | 2220 | disable = dtoh32(disable); |
2221 | result = (uint8) (txpwrdbm & ~WL_TXPWR_OVERRIDE); | 2221 | result = (u8) (txpwrdbm & ~WL_TXPWR_OVERRIDE); |
2222 | vwrq->value = (int32) bcm_qdbm_to_mw(result); | 2222 | vwrq->value = (int32) bcm_qdbm_to_mw(result); |
2223 | vwrq->fixed = 0; | 2223 | vwrq->fixed = 0; |
2224 | vwrq->disabled = | 2224 | vwrq->disabled = |
@@ -2585,7 +2585,7 @@ wl_iw_set_encodeext(struct net_device *dev, | |||
2585 | bcopy((void *)iwe->key, key.data, iwe->key_len); | 2585 | bcopy((void *)iwe->key, key.data, iwe->key_len); |
2586 | 2586 | ||
2587 | if (iwe->alg == IW_ENCODE_ALG_TKIP) { | 2587 | if (iwe->alg == IW_ENCODE_ALG_TKIP) { |
2588 | uint8 keybuf[8]; | 2588 | u8 keybuf[8]; |
2589 | bcopy(&key.data[24], keybuf, sizeof(keybuf)); | 2589 | bcopy(&key.data[24], keybuf, sizeof(keybuf)); |
2590 | bcopy(&key.data[16], &key.data[24], sizeof(keybuf)); | 2590 | bcopy(&key.data[16], &key.data[24], sizeof(keybuf)); |
2591 | bcopy(keybuf, &key.data[16], sizeof(keybuf)); | 2591 | bcopy(keybuf, &key.data[16], sizeof(keybuf)); |
@@ -3508,7 +3508,7 @@ void wl_iw_event(struct net_device *dev, wl_event_msg_t *e, void *data) | |||
3508 | cmd = IWEVPMKIDCAND; | 3508 | cmd = IWEVPMKIDCAND; |
3509 | pmkcandlist = data; | 3509 | pmkcandlist = data; |
3510 | count = | 3510 | count = |
3511 | ntoh32_ua((uint8 *) & | 3511 | ntoh32_ua((u8 *) & |
3512 | pmkcandlist->npmkid_cand); | 3512 | pmkcandlist->npmkid_cand); |
3513 | ASSERT(count >= 0); | 3513 | ASSERT(count >= 0); |
3514 | wrqu.data.length = sizeof(struct iw_pmkid_cand); | 3514 | wrqu.data.length = sizeof(struct iw_pmkid_cand); |