Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 29750b90 编写于 作者: S Stanislav Fomichev 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: brcm80211: replace htod/dtoh broadcom defines 

htod32 -> cpu_to_le32
htod16 -> cpu_to_le16
dtoh32 -> le32_to_cpu
dtoh16 -> le16_to_cpu

For brcmfmac/dhd_common.c just removed defines.
Signed-off-by: NStanislav Fomichev <kernel@fomichev.me>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 458b2e4d
展开全部 显示空白变更内容
内联 并排
Showing with 239 addition and 276 deletion
drivers/staging/brcm80211/brcmfmac/dhd_common.c
浏览文件 @ 29750b90
...@@ -37,11 +37,6 @@ u32 dhd_conn_event; ...@@ -37,11 +37,6 @@ u32 dhd_conn_event;
u32 dhd_conn_status; u32 dhd_conn_status;
u32 dhd_conn_reason; u32 dhd_conn_reason;
#define htod32(i) i
#define htod16(i) i
#define dtoh32(i) i
#define dtoh16(i) i
extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, extern int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf,
uint len); uint len);
extern void dhd_ind_scan_confirm(void *h, bool status); extern void dhd_ind_scan_confirm(void *h, bool status);
...@@ -975,10 +970,10 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable, ...@@ -975,10 +970,10 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable,
pkt_filterp = (wl_pkt_filter_enable_t *) (buf + str_len + 1); pkt_filterp = (wl_pkt_filter_enable_t *) (buf + str_len + 1);
/* Parse packet filter id. */ /* Parse packet filter id. */
enable_parm.id = htod32(simple_strtoul(argv[i], NULL, 0)); enable_parm.id = simple_strtoul(argv[i], NULL, 0);
/* Parse enable/disable value. */ /* Parse enable/disable value. */
enable_parm.enable = htod32(enable); enable_parm.enable = enable;
buf_len += sizeof(enable_parm); buf_len += sizeof(enable_parm);
memcpy((char *)pkt_filterp, &enable_parm, sizeof(enable_parm)); memcpy((char *)pkt_filterp, &enable_parm, sizeof(enable_parm));
...@@ -1063,7 +1058,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) ...@@ -1063,7 +1058,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
pkt_filterp = (wl_pkt_filter_t *) (buf + str_len + 1); pkt_filterp = (wl_pkt_filter_t *) (buf + str_len + 1);
/* Parse packet filter id. */ /* Parse packet filter id. */
pkt_filter.id = htod32(simple_strtoul(argv[i], NULL, 0)); pkt_filter.id = simple_strtoul(argv[i], NULL, 0);
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
DHD_ERROR(("Polarity not provided\n")); DHD_ERROR(("Polarity not provided\n"));
...@@ -1071,7 +1066,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) ...@@ -1071,7 +1066,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
} }
/* Parse filter polarity. */ /* Parse filter polarity. */
pkt_filter.negate_match = htod32(simple_strtoul(argv[i], NULL, 0)); pkt_filter.negate_match = simple_strtoul(argv[i], NULL, 0);
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
DHD_ERROR(("Filter type not provided\n")); DHD_ERROR(("Filter type not provided\n"));
...@@ -1079,7 +1074,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) ...@@ -1079,7 +1074,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
} }
/* Parse filter type. */ /* Parse filter type. */
pkt_filter.type = htod32(simple_strtoul(argv[i], NULL, 0)); pkt_filter.type = simple_strtoul(argv[i], NULL, 0);
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
DHD_ERROR(("Offset not provided\n")); DHD_ERROR(("Offset not provided\n"));
...@@ -1087,7 +1082,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) ...@@ -1087,7 +1082,7 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
} }
/* Parse pattern filter offset. */ /* Parse pattern filter offset. */
pkt_filter.u.pattern.offset = htod32(simple_strtoul(argv[i], NULL, 0)); pkt_filter.u.pattern.offset = simple_strtoul(argv[i], NULL, 0);
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
DHD_ERROR(("Bitmask not provided\n")); DHD_ERROR(("Bitmask not provided\n"));
...@@ -1096,8 +1091,8 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) ...@@ -1096,8 +1091,8 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
/* Parse pattern filter mask. */ /* Parse pattern filter mask. */
mask_size = mask_size =
htod32(wl_pattern_atoh wl_pattern_atoh
(argv[i], (char *)pkt_filterp->u.pattern.mask_and_pattern)); (argv[i], (char *)pkt_filterp->u.pattern.mask_and_pattern);
if (NULL == argv[++i]) { if (NULL == argv[++i]) {
DHD_ERROR(("Pattern not provided\n")); DHD_ERROR(("Pattern not provided\n"));
...@@ -1106,9 +1101,9 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) ...@@ -1106,9 +1101,9 @@ void dhd_pktfilter_offload_set(dhd_pub_t *dhd, char *arg)
/* Parse pattern filter pattern. */ /* Parse pattern filter pattern. */
pattern_size = pattern_size =
htod32(wl_pattern_atoh(argv[i], wl_pattern_atoh(argv[i],
(char *)&pkt_filterp->u.pattern. (char *)&pkt_filterp->u.pattern.
mask_and_pattern[mask_size])); mask_and_pattern[mask_size]);
if (mask_size != pattern_size) { if (mask_size != pattern_size) {
DHD_ERROR(("Mask and pattern not the same size\n")); DHD_ERROR(("Mask and pattern not the same size\n"));
...@@ -1428,8 +1423,7 @@ int dhd_iscan_print_cache(iscan_buf_t *iscan_skip) ...@@ -1428,8 +1423,7 @@ int dhd_iscan_print_cache(iscan_buf_t *iscan_skip)
bi->BSSID.octet[2], bi->BSSID.octet[3], bi->BSSID.octet[2], bi->BSSID.octet[3],
bi->BSSID.octet[4], bi->BSSID.octet[5])); bi->BSSID.octet[4], bi->BSSID.octet[5]));
bi = (wl_bss_info_t *)((unsigned long)bi + bi = (wl_bss_info_t *)((unsigned long)bi + bi->length);
dtoh32(bi->length));
} }
iscan_cur = iscan_cur->next; iscan_cur = iscan_cur->next;
l++; l++;
...@@ -1493,18 +1487,16 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) ...@@ -1493,18 +1487,16 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip)
bi->BSSID.octet[5])); bi->BSSID.octet[5]));
bi_new = bi; bi_new = bi;
bi = (wl_bss_info_t *)((unsigned long)bi + bi = (wl_bss_info_t *)((unsigned long)
dtoh32 bi + bi->length);
(bi->length));
/* /*
if(bi && bi_new) { if(bi && bi_new) {
memcpy(bi_new, bi, results->buflen - memcpy(bi_new, bi, results->buflen -
dtoh32(bi_new->length)); bi_new->length);
results->buflen -= dtoh32(bi_new->length); results->buflen -= bi_new->length;
} }
*/ */
results->buflen -= results->buflen -= bi_new->length;
dtoh32(bi_new->length);
results->count--; results->count--;
for (j = i; j < results->count; j++) { for (j = i; j < results->count; j++) {
...@@ -1520,16 +1512,13 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) ...@@ -1520,16 +1512,13 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip)
bi_next = bi_next =
(wl_bss_info_t *)((unsigned long)bi + (wl_bss_info_t *)((unsigned long)bi +
dtoh32 bi->length);
(bi->length));
memcpy(bi_new, bi, memcpy(bi_new, bi,
dtoh32 bi->length);
(bi->length));
bi_new = bi_new =
(wl_bss_info_t *)((unsigned long)bi_new + (wl_bss_info_t *)((unsigned long)bi_new +
dtoh32 bi_new->
(bi_new-> length);
length));
bi = bi_next; bi = bi_next;
} }
} }
...@@ -1544,7 +1533,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) ...@@ -1544,7 +1533,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip)
break; break;
} }
bi = (wl_bss_info_t *)((unsigned long)bi + bi = (wl_bss_info_t *)((unsigned long)bi +
dtoh32(bi->length)); bi->length);
} }
} }
iscan_cur = iscan_cur->next; iscan_cur = iscan_cur->next;
...@@ -1598,7 +1587,7 @@ int dhd_iscan_remove_duplicates(void *dhdp, iscan_buf_t *iscan_cur) ...@@ -1598,7 +1587,7 @@ int dhd_iscan_remove_duplicates(void *dhdp, iscan_buf_t *iscan_cur)
dhd_iscan_delete_bss(dhdp, bi->BSSID.octet, iscan_cur); dhd_iscan_delete_bss(dhdp, bi->BSSID.octet, iscan_cur);
bi = (wl_bss_info_t *)((unsigned long)bi + dtoh32(bi->length)); bi = (wl_bss_info_t *)((unsigned long)bi + bi->length);
} }
done: done:
...@@ -1627,15 +1616,15 @@ int dhd_iscan_request(void *dhdp, u16 action) ...@@ -1627,15 +1616,15 @@ int dhd_iscan_request(void *dhdp, u16 action)
params.params.bss_type = DOT11_BSSTYPE_ANY; params.params.bss_type = DOT11_BSSTYPE_ANY;
params.params.scan_type = DOT11_SCANTYPE_ACTIVE; params.params.scan_type = DOT11_SCANTYPE_ACTIVE;
params.params.nprobes = htod32(-1); params.params.nprobes = -1;
params.params.active_time = htod32(-1); params.params.active_time = -1;
params.params.passive_time = htod32(-1); params.params.passive_time = -1;
params.params.home_time = htod32(-1); params.params.home_time = -1;
params.params.channel_num = htod32(0); params.params.channel_num = 0;
params.version = htod32(ISCAN_REQ_VERSION); params.version = ISCAN_REQ_VERSION;
params.action = htod16(action); params.action = action;
params.scan_duration = htod16(0); params.scan_duration = 0;
bcm_mkiovar("iscan", (char *)&params, sizeof(wl_iscan_params_t), buf, bcm_mkiovar("iscan", (char *)&params, sizeof(wl_iscan_params_t), buf,
WLC_IOCTL_SMLEN); WLC_IOCTL_SMLEN);
...@@ -1672,16 +1661,16 @@ static int dhd_iscan_get_partial_result(void *dhdp, uint *scan_count) ...@@ -1672,16 +1661,16 @@ static int dhd_iscan_get_partial_result(void *dhdp, uint *scan_count)
results->count = 0; results->count = 0;
memset(&list, 0, sizeof(list)); memset(&list, 0, sizeof(list));
list.results.buflen = htod32(WLC_IW_ISCAN_MAXLEN); list.results.buflen = WLC_IW_ISCAN_MAXLEN;
bcm_mkiovar("iscanresults", (char *)&list, WL_ISCAN_RESULTS_FIXED_SIZE, bcm_mkiovar("iscanresults", (char *)&list, WL_ISCAN_RESULTS_FIXED_SIZE,
iscan_cur->iscan_buf, WLC_IW_ISCAN_MAXLEN); iscan_cur->iscan_buf, WLC_IW_ISCAN_MAXLEN);
rc = dhd_wl_ioctl(dhdp, WLC_GET_VAR, iscan_cur->iscan_buf, rc = dhd_wl_ioctl(dhdp, WLC_GET_VAR, iscan_cur->iscan_buf,
WLC_IW_ISCAN_MAXLEN); WLC_IW_ISCAN_MAXLEN);
results->buflen = dtoh32(results->buflen); results->buflen = results->buflen;
results->version = dtoh32(results->version); results->version = results->version;
*scan_count = results->count = dtoh32(results->count); *scan_count = results->count = results->count;
status = dtoh32(list_buf->status); status = list_buf->status;
dhd_iscan_unlock(); dhd_iscan_unlock();
...@@ -1804,12 +1793,12 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char sc ...@@ -1804,12 +1793,12 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char sc
memset(&pfn_element, 0, sizeof(pfn_element)); memset(&pfn_element, 0, sizeof(pfn_element));
/* set pfn parameters */ /* set pfn parameters */
pfn_param.version = htod32(PFN_VERSION); pfn_param.version = PFN_VERSION;
pfn_param.flags = htod16((PFN_LIST_ORDER << SORT_CRITERIA_BIT)); pfn_param.flags = (PFN_LIST_ORDER << SORT_CRITERIA_BIT);
/* set up pno scan fr */ /* set up pno scan fr */
if (scan_fr != 0) if (scan_fr != 0)
pfn_param.scan_freq = htod32(scan_fr); pfn_param.scan_freq = scan_fr;
bcm_mkiovar("pfn_set", (char *)&pfn_param, sizeof(pfn_param), iovbuf, bcm_mkiovar("pfn_set", (char *)&pfn_param, sizeof(pfn_param), iovbuf,
sizeof(iovbuf)); sizeof(iovbuf));
...@@ -1818,11 +1807,11 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char sc ...@@ -1818,11 +1807,11 @@ dhd_pno_set(dhd_pub_t *dhd, wlc_ssid_t *ssids_local, int nssid, unsigned char sc
/* set all pfn ssid */ /* set all pfn ssid */
for (i = 0; i < nssid; i++) { for (i = 0; i < nssid; i++) {
pfn_element.bss_type = htod32(DOT11_BSSTYPE_INFRASTRUCTURE); pfn_element.bss_type = DOT11_BSSTYPE_INFRASTRUCTURE;
pfn_element.auth = (DOT11_OPEN_SYSTEM); pfn_element.auth = DOT11_OPEN_SYSTEM;
pfn_element.wpa_auth = htod32(WPA_AUTH_PFN_ANY); pfn_element.wpa_auth = WPA_AUTH_PFN_ANY;
pfn_element.wsec = htod32(0); pfn_element.wsec = 0;
pfn_element.infra = htod32(1); pfn_element.infra = 1;
memcpy((char *)pfn_element.ssid.SSID, ssids_local[i].SSID, memcpy((char *)pfn_element.ssid.SSID, ssids_local[i].SSID,
ssids_local[i].SSID_len); ssids_local[i].SSID_len);
......
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
浏览文件 @ 29750b90
...@@ -555,24 +555,24 @@ static const u32 __wl_cipher_suites[] = { ...@@ -555,24 +555,24 @@ static const u32 __wl_cipher_suites[] = {
static void swap_key_from_BE(struct wl_wsec_key *key) static void swap_key_from_BE(struct wl_wsec_key *key)
{ {
key->index = htod32(key->index); key->index = cpu_to_le32(key->index);
key->len = htod32(key->len); key->len = cpu_to_le32(key->len);
key->algo = htod32(key->algo); key->algo = cpu_to_le32(key->algo);
key->flags = htod32(key->flags); key->flags = cpu_to_le32(key->flags);
key->rxiv.hi = htod32(key->rxiv.hi); key->rxiv.hi = cpu_to_le32(key->rxiv.hi);
key->rxiv.lo = htod16(key->rxiv.lo); key->rxiv.lo = cpu_to_le16(key->rxiv.lo);
key->iv_initialized = htod32(key->iv_initialized); key->iv_initialized = cpu_to_le32(key->iv_initialized);
} }
static void swap_key_to_BE(struct wl_wsec_key *key) static void swap_key_to_BE(struct wl_wsec_key *key)
{ {
key->index = dtoh32(key->index); key->index = le32_to_cpu(key->index);
key->len = dtoh32(key->len); key->len = le32_to_cpu(key->len);
key->algo = dtoh32(key->algo); key->algo = le32_to_cpu(key->algo);
key->flags = dtoh32(key->flags); key->flags = le32_to_cpu(key->flags);
key->rxiv.hi = dtoh32(key->rxiv.hi); key->rxiv.hi = le32_to_cpu(key->rxiv.hi);
key->rxiv.lo = dtoh16(key->rxiv.lo); key->rxiv.lo = le16_to_cpu(key->rxiv.lo);
key->iv_initialized = dtoh32(key->iv_initialized); key->iv_initialized = le32_to_cpu(key->iv_initialized);
} }
static s32 static s32
...@@ -626,8 +626,8 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ...@@ -626,8 +626,8 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
default: default:
return -EINVAL; return -EINVAL;
} }
infra = htod32(infra); infra = cpu_to_le32(infra);
ap = htod32(ap); ap = cpu_to_le32(ap);
wdev = ndev->ieee80211_ptr; wdev = ndev->ieee80211_ptr;
wdev->iftype = type; wdev->iftype = type;
WL_DBG("%s : ap (%d), infra (%d)\n", ndev->name, ap, infra); WL_DBG("%s : ap (%d), infra (%d)\n", ndev->name, ap, infra);
...@@ -657,10 +657,10 @@ static void wl_iscan_prep(struct wl_scan_params *params, struct wlc_ssid *ssid) ...@@ -657,10 +657,10 @@ static void wl_iscan_prep(struct wl_scan_params *params, struct wlc_ssid *ssid)
params->home_time = -1; params->home_time = -1;
params->channel_num = 0; params->channel_num = 0;
params->nprobes = htod32(params->nprobes); params->nprobes = cpu_to_le32(params->nprobes);
params->active_time = htod32(params->active_time); params->active_time = cpu_to_le32(params->active_time);
params->passive_time = htod32(params->passive_time); params->passive_time = cpu_to_le32(params->passive_time);
params->home_time = htod32(params->home_time); params->home_time = cpu_to_le32(params->home_time);
if (ssid && ssid->SSID_len) if (ssid && ssid->SSID_len)
memcpy(&params->ssid, ssid, sizeof(wlc_ssid_t)); memcpy(&params->ssid, ssid, sizeof(wlc_ssid_t));
...@@ -707,9 +707,9 @@ wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action) ...@@ -707,9 +707,9 @@ wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action)
wl_iscan_prep(&params->params, ssid); wl_iscan_prep(&params->params, ssid);
params->version = htod32(ISCAN_REQ_VERSION); params->version = cpu_to_le32(ISCAN_REQ_VERSION);
params->action = htod16(action); params->action = cpu_to_le16(action);
params->scan_duration = htod16(0); params->scan_duration = cpu_to_le16(0);
/* params_size += offsetof(wl_iscan_params_t, params); */ /* params_size += offsetof(wl_iscan_params_t, params); */
err = wl_dev_iovar_setbuf(iscan->dev, "iscan", params, params_size, err = wl_dev_iovar_setbuf(iscan->dev, "iscan", params, params_size,
...@@ -812,7 +812,7 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, ...@@ -812,7 +812,7 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
min_t(u8, sizeof(sr->ssid.SSID), ssids->ssid_len); min_t(u8, sizeof(sr->ssid.SSID), ssids->ssid_len);
if (sr->ssid.SSID_len) { if (sr->ssid.SSID_len) {
memcpy(sr->ssid.SSID, ssids->ssid, sr->ssid.SSID_len); memcpy(sr->ssid.SSID, ssids->ssid, sr->ssid.SSID_len);
sr->ssid.SSID_len = htod32(sr->ssid.SSID_len); sr->ssid.SSID_len = cpu_to_le32(sr->ssid.SSID_len);
WL_DBG("Specific scan ssid=\"%s\" len=%d\n", WL_DBG("Specific scan ssid=\"%s\" len=%d\n",
sr->ssid.SSID, sr->ssid.SSID_len); sr->ssid.SSID, sr->ssid.SSID_len);
spec_scan = true; spec_scan = true;
...@@ -872,7 +872,7 @@ static s32 wl_dev_intvar_set(struct net_device *dev, s8 *name, s32 val) ...@@ -872,7 +872,7 @@ static s32 wl_dev_intvar_set(struct net_device *dev, s8 *name, s32 val)
u32 len; u32 len;
s32 err = 0; s32 err = 0;
val = htod32(val); val = cpu_to_le32(val);
len = bcm_mkiovar(name, (char *)(&val), sizeof(val), buf, sizeof(buf)); len = bcm_mkiovar(name, (char *)(&val), sizeof(val), buf, sizeof(buf));
BUG_ON(!len); BUG_ON(!len);
...@@ -903,7 +903,7 @@ wl_dev_intvar_get(struct net_device *dev, s8 *name, s32 *retval) ...@@ -903,7 +903,7 @@ wl_dev_intvar_get(struct net_device *dev, s8 *name, s32 *retval)
if (unlikely(err)) { if (unlikely(err)) {
WL_ERR("error (%d)\n", err); WL_ERR("error (%d)\n", err);
} }
*retval = dtoh32(var.val); *retval = le32_to_cpu(var.val);
return err; return err;
} }
...@@ -937,7 +937,7 @@ static s32 wl_set_retry(struct net_device *dev, u32 retry, bool l) ...@@ -937,7 +937,7 @@ static s32 wl_set_retry(struct net_device *dev, u32 retry, bool l)
s32 err = 0; s32 err = 0;
u32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL); u32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL);
retry = htod32(retry); retry = cpu_to_le32(retry);
err = wl_dev_ioctl(dev, cmd, &retry, sizeof(retry)); err = wl_dev_ioctl(dev, cmd, &retry, sizeof(retry));
if (unlikely(err)) { if (unlikely(err)) {
WL_ERR("cmd (%d) , error (%d)\n", cmd, err); WL_ERR("cmd (%d) , error (%d)\n", cmd, err);
...@@ -1040,7 +1040,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, ...@@ -1040,7 +1040,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
memset(&join_params, 0, sizeof(join_params)); memset(&join_params, 0, sizeof(join_params));
memcpy((void *)join_params.ssid.SSID, (void *)params->ssid, memcpy((void *)join_params.ssid.SSID, (void *)params->ssid,
params->ssid_len); params->ssid_len);
join_params.ssid.SSID_len = htod32(params->ssid_len); join_params.ssid.SSID_len = cpu_to_le32(params->ssid_len);
if (params->bssid) if (params->bssid)
memcpy(&join_params.params.bssid, params->bssid, memcpy(&join_params.params.bssid, params->bssid,
ETH_ALEN); ETH_ALEN);
...@@ -1370,7 +1370,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -1370,7 +1370,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
join_params.ssid.SSID_len = min(sizeof(join_params.ssid.SSID), sme->ssid_len); join_params.ssid.SSID_len = min(sizeof(join_params.ssid.SSID), sme->ssid_len);
memcpy(&join_params.ssid.SSID, sme->ssid, join_params.ssid.SSID_len); memcpy(&join_params.ssid.SSID, sme->ssid, join_params.ssid.SSID_len);
join_params.ssid.SSID_len = htod32(join_params.ssid.SSID_len); join_params.ssid.SSID_len = cpu_to_le32(join_params.ssid.SSID_len);
wl_update_prof(wl, NULL, &join_params.ssid, WL_PROF_SSID); wl_update_prof(wl, NULL, &join_params.ssid, WL_PROF_SSID);
memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN); memcpy(join_params.params.bssid, ether_bcast, ETH_ALEN);
...@@ -1406,7 +1406,7 @@ wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, ...@@ -1406,7 +1406,7 @@ wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
if (likely(act)) { if (likely(act)) {
scbval.val = reason_code; scbval.val = reason_code;
memcpy(&scbval.ea, &wl->bssid, ETH_ALEN); memcpy(&scbval.ea, &wl->bssid, ETH_ALEN);
scbval.val = htod32(scbval.val); scbval.val = cpu_to_le32(scbval.val);
err = wl_dev_ioctl(dev, WLC_DISASSOC, &scbval, err = wl_dev_ioctl(dev, WLC_DISASSOC, &scbval,
sizeof(scb_val_t)); sizeof(scb_val_t));
if (unlikely(err)) { if (unlikely(err)) {
...@@ -1448,7 +1448,7 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy, ...@@ -1448,7 +1448,7 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy,
} }
/* Make sure radio is off or on as far as software is concerned */ /* Make sure radio is off or on as far as software is concerned */
disable = WL_RADIO_SW_DISABLE << 16; disable = WL_RADIO_SW_DISABLE << 16;
disable = htod32(disable); disable = cpu_to_le32(disable);
err = wl_dev_ioctl(ndev, WLC_SET_RADIO, &disable, sizeof(disable)); err = wl_dev_ioctl(ndev, WLC_SET_RADIO, &disable, sizeof(disable));
if (unlikely(err)) { if (unlikely(err)) {
WL_ERR("WLC_SET_RADIO error (%d)\n", err); WL_ERR("WLC_SET_RADIO error (%d)\n", err);
...@@ -1506,11 +1506,11 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -1506,11 +1506,11 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev,
WL_ERR("WLC_GET_WSEC error (%d)\n", err); WL_ERR("WLC_GET_WSEC error (%d)\n", err);
return err; return err;
} }
wsec = dtoh32(wsec); wsec = le32_to_cpu(wsec);
if (wsec & WEP_ENABLED) { if (wsec & WEP_ENABLED) {
/* Just select a new current key */ /* Just select a new current key */
index = (u32) key_idx; index = (u32) key_idx;
index = htod32(index); index = cpu_to_le32(index);
err = wl_dev_ioctl(dev, WLC_SET_KEY_PRIMARY, &index, err = wl_dev_ioctl(dev, WLC_SET_KEY_PRIMARY, &index,
sizeof(index)); sizeof(index));
if (unlikely(err)) { if (unlikely(err)) {
...@@ -1683,7 +1683,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -1683,7 +1683,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
} }
val = 1; /* assume shared key. otherwise 0 */ val = 1; /* assume shared key. otherwise 0 */
val = htod32(val); val = cpu_to_le32(val);
err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val)); err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val));
if (unlikely(err)) { if (unlikely(err)) {
WL_ERR("WLC_SET_AUTH error (%d)\n", err); WL_ERR("WLC_SET_AUTH error (%d)\n", err);
...@@ -1739,7 +1739,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -1739,7 +1739,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
} }
val = 0; /* assume open key. otherwise 1 */ val = 0; /* assume open key. otherwise 1 */
val = htod32(val); val = cpu_to_le32(val);
err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val)); err = wl_dev_ioctl(dev, WLC_SET_AUTH, &val, sizeof(val));
if (unlikely(err)) { if (unlikely(err)) {
WL_ERR("WLC_SET_AUTH error (%d)\n", err); WL_ERR("WLC_SET_AUTH error (%d)\n", err);
...@@ -1775,7 +1775,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -1775,7 +1775,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
WL_ERR("WLC_GET_WSEC error (%d)\n", err); WL_ERR("WLC_GET_WSEC error (%d)\n", err);
return err; return err;
} }
wsec = dtoh32(wsec); wsec = le32_to_cpu(wsec);
switch (wsec) { switch (wsec) {
case WEP_ENABLED: case WEP_ENABLED:
sec = wl_read_prof(wl, WL_PROF_SEC); sec = wl_read_prof(wl, WL_PROF_SEC);
...@@ -1835,7 +1835,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -1835,7 +1835,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
if (err) { if (err) {
WL_ERR("Could not get rate (%d)\n", err); WL_ERR("Could not get rate (%d)\n", err);
} else { } else {
rate = dtoh32(rate); rate = le32_to_cpu(rate);
sinfo->filled |= STATION_INFO_TX_BITRATE; sinfo->filled |= STATION_INFO_TX_BITRATE;
sinfo->txrate.legacy = rate * 5; sinfo->txrate.legacy = rate * 5;
WL_DBG("Rate %d Mbps\n", rate / 2); WL_DBG("Rate %d Mbps\n", rate / 2);
...@@ -1849,7 +1849,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, ...@@ -1849,7 +1849,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
WL_ERR("Could not get rssi (%d)\n", err); WL_ERR("Could not get rssi (%d)\n", err);
return err; return err;
} }
rssi = dtoh32(scb_val.val); rssi = le32_to_cpu(scb_val.val);
sinfo->filled |= STATION_INFO_SIGNAL; sinfo->filled |= STATION_INFO_SIGNAL;
sinfo->signal = rssi; sinfo->signal = rssi;
WL_DBG("RSSI %d dBm\n", rssi); WL_DBG("RSSI %d dBm\n", rssi);
...@@ -1867,7 +1867,7 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, ...@@ -1867,7 +1867,7 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
CHECK_SYS_UP(); CHECK_SYS_UP();
pm = enabled ? PM_FAST : PM_OFF; pm = enabled ? PM_FAST : PM_OFF;
pm = htod32(pm); pm = cpu_to_le32(pm);
WL_DBG("power save %s\n", (pm ? "enabled" : "disabled")); WL_DBG("power save %s\n", (pm ? "enabled" : "disabled"));
err = wl_dev_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm)); err = wl_dev_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm));
if (unlikely(err)) { if (unlikely(err)) {
...@@ -1930,7 +1930,7 @@ wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev, ...@@ -1930,7 +1930,7 @@ wl_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev,
return err; return err;
} }
rateset.count = dtoh32(rateset.count); rateset.count = le32_to_cpu(rateset.count);
legacy = wl_find_msb(mask->control[IEEE80211_BAND_2GHZ].legacy); legacy = wl_find_msb(mask->control[IEEE80211_BAND_2GHZ].legacy);
if (!legacy) if (!legacy)
...@@ -2263,7 +2263,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi) ...@@ -2263,7 +2263,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
u32 freq; u32 freq;
s32 err = 0; s32 err = 0;
if (unlikely(dtoh32(bi->length) > WL_BSS_INFO_MAX)) { if (unlikely(le32_to_cpu(bi->length) > WL_BSS_INFO_MAX)) {
WL_DBG("Beacon is larger than buffer. Discarding\n"); WL_DBG("Beacon is larger than buffer. Discarding\n");
return err; return err;
} }
...@@ -2536,10 +2536,10 @@ static void wl_ch_to_chanspec(int ch, struct wl_join_params *join_params, ...@@ -2536,10 +2536,10 @@ static void wl_ch_to_chanspec(int ch, struct wl_join_params *join_params,
join_params->params.chanspec_list[0] &= WL_CHANSPEC_CHAN_MASK; join_params->params.chanspec_list[0] &= WL_CHANSPEC_CHAN_MASK;
join_params->params.chanspec_list[0] |= chanspec; join_params->params.chanspec_list[0] |= chanspec;
join_params->params.chanspec_list[0] = join_params->params.chanspec_list[0] =
htodchanspec(join_params->params.chanspec_list[0]); cpu_to_le16(join_params->params.chanspec_list[0]);
join_params->params.chanspec_num = join_params->params.chanspec_num =
htod32(join_params->params.chanspec_num); cpu_to_le32(join_params->params.chanspec_num);
WL_DBG("join_params->params.chanspec_list[0]= %#X, channel %d, chanspec %#X\n", WL_DBG("join_params->params.chanspec_list[0]= %#X, channel %d, chanspec %#X\n",
join_params->params.chanspec_list[0], ch, chanspec); join_params->params.chanspec_list[0], ch, chanspec);
...@@ -2570,7 +2570,7 @@ static s32 wl_update_bss_info(struct wl_priv *wl) ...@@ -2570,7 +2570,7 @@ static s32 wl_update_bss_info(struct wl_priv *wl)
rtnl_lock(); rtnl_lock();
if (unlikely(!bss)) { if (unlikely(!bss)) {
WL_DBG("Could not find the AP\n"); WL_DBG("Could not find the AP\n");
*(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX); *(u32 *) wl->extra_buf = cpu_to_le32(WL_EXTRA_BUF_MAX);
err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_BSS_INFO, err = wl_dev_ioctl(wl_to_ndev(wl), WLC_GET_BSS_INFO,
wl->extra_buf, WL_EXTRA_BUF_MAX); wl->extra_buf, WL_EXTRA_BUF_MAX);
if (unlikely(err)) { if (unlikely(err)) {
...@@ -2722,7 +2722,7 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, ...@@ -2722,7 +2722,7 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
WL_ERR("scan busy (%d)\n", err); WL_ERR("scan busy (%d)\n", err);
goto scan_done_out; goto scan_done_out;
} }
channel_inform.scan_channel = dtoh32(channel_inform.scan_channel); channel_inform.scan_channel = le32_to_cpu(channel_inform.scan_channel);
if (unlikely(channel_inform.scan_channel)) { if (unlikely(channel_inform.scan_channel)) {
WL_DBG("channel_inform.scan_channel (%d)\n", WL_DBG("channel_inform.scan_channel (%d)\n",
...@@ -2731,16 +2731,16 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, ...@@ -2731,16 +2731,16 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
wl->bss_list = wl->scan_results; wl->bss_list = wl->scan_results;
bss_list = wl->bss_list; bss_list = wl->bss_list;
memset(bss_list, 0, len); memset(bss_list, 0, len);
bss_list->buflen = htod32(len); bss_list->buflen = cpu_to_le32(len);
err = wl_dev_ioctl(ndev, WLC_SCAN_RESULTS, bss_list, len); err = wl_dev_ioctl(ndev, WLC_SCAN_RESULTS, bss_list, len);
if (unlikely(err)) { if (unlikely(err)) {
WL_ERR("%s Scan_results error (%d)\n", ndev->name, err); WL_ERR("%s Scan_results error (%d)\n", ndev->name, err);
err = -EINVAL; err = -EINVAL;
goto scan_done_out; goto scan_done_out;
} }
bss_list->buflen = dtoh32(bss_list->buflen); bss_list->buflen = le32_to_cpu(bss_list->buflen);
bss_list->version = dtoh32(bss_list->version); bss_list->version = le32_to_cpu(bss_list->version);
bss_list->count = dtoh32(bss_list->count); bss_list->count = le32_to_cpu(bss_list->count);
err = wl_inform_bss(wl); err = wl_inform_bss(wl);
if (err) if (err)
...@@ -2949,7 +2949,7 @@ wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status, ...@@ -2949,7 +2949,7 @@ wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status,
results->count = 0; results->count = 0;
memset(&list, 0, sizeof(list)); memset(&list, 0, sizeof(list));
list.results.buflen = htod32(WL_ISCAN_BUF_MAX); list.results.buflen = cpu_to_le32(WL_ISCAN_BUF_MAX);
err = wl_dev_iovar_getbuf(iscan->dev, "iscanresults", &list, err = wl_dev_iovar_getbuf(iscan->dev, "iscanresults", &list,
WL_ISCAN_RESULTS_FIXED_SIZE, iscan->scan_buf, WL_ISCAN_RESULTS_FIXED_SIZE, iscan->scan_buf,
WL_ISCAN_BUF_MAX); WL_ISCAN_BUF_MAX);
...@@ -2957,12 +2957,12 @@ wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status, ...@@ -2957,12 +2957,12 @@ wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status,
WL_ERR("error (%d)\n", err); WL_ERR("error (%d)\n", err);
return err; return err;
} }
results->buflen = dtoh32(results->buflen); results->buflen = le32_to_cpu(results->buflen);
results->version = dtoh32(results->version); results->version = le32_to_cpu(results->version);
results->count = dtoh32(results->count); results->count = le32_to_cpu(results->count);
WL_DBG("results->count = %d\n", results->count); WL_DBG("results->count = %d\n", results->count);
WL_DBG("results->buflen = %d\n", results->buflen); WL_DBG("results->buflen = %d\n", results->buflen);
*status = dtoh32(list_buf->status); *status = le32_to_cpu(list_buf->status);
*bss_list = results; *bss_list = results;
return err; return err;
...@@ -3392,8 +3392,8 @@ static s32 wl_dongle_mode(struct net_device *ndev, s32 iftype) ...@@ -3392,8 +3392,8 @@ static s32 wl_dongle_mode(struct net_device *ndev, s32 iftype)
WL_ERR("invalid type (%d)\n", iftype); WL_ERR("invalid type (%d)\n", iftype);
return err; return err;
} }
infra = htod32(infra); infra = cpu_to_le32(infra);
ap = htod32(ap); ap = cpu_to_le32(ap);
WL_DBG("%s ap (%d), infra (%d)\n", ndev->name, ap, infra); WL_DBG("%s ap (%d), infra (%d)\n", ndev->name, ap, infra);
err = wl_dev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra)); err = wl_dev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra));
if (unlikely(err)) { if (unlikely(err)) {
...@@ -3655,26 +3655,28 @@ static s32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode) ...@@ -3655,26 +3655,28 @@ static s32 wl_dongle_filter(struct net_device *ndev, u32 filter_mode)
pkt_filterp = (struct wl_pkt_filter *)(buf + str_len + 1); pkt_filterp = (struct wl_pkt_filter *)(buf + str_len + 1);
/* Parse packet filter id. */ /* Parse packet filter id. */
pkt_filter.id = htod32(100); pkt_filter.id = cpu_to_le32(100);
/* Parse filter polarity. */ /* Parse filter polarity. */
pkt_filter.negate_match = htod32(0); pkt_filter.negate_match = cpu_to_le32(0);
/* Parse filter type. */ /* Parse filter type. */
pkt_filter.type = htod32(0); pkt_filter.type = cpu_to_le32(0);
/* Parse pattern filter offset. */ /* Parse pattern filter offset. */
pkt_filter.u.pattern.offset = htod32(0); pkt_filter.u.pattern.offset = cpu_to_le32(0);
/* Parse pattern filter mask. */ /* Parse pattern filter mask. */
mask_size = htod32(wl_pattern_atoh("0xff", mask_size = cpu_to_le32(wl_pattern_atoh("0xff",
(char *)pkt_filterp->u.pattern. (char *)pkt_filterp->u.pattern.
mask_and_pattern)); mask_and_pattern));
/* Parse pattern filter pattern. */ /* Parse pattern filter pattern. */
pattern_size = htod32(wl_pattern_atoh("0x00", pattern_size = cpu_to_le32(wl_pattern_atoh("0x00",
(char *)&pkt_filterp->u.pattern. (char *)&pkt_filterp->u.
mask_and_pattern[mask_size])); pattern.
mask_and_pattern
[mask_size]));
if (mask_size != pattern_size) { if (mask_size != pattern_size) {
WL_ERR("Mask and pattern not the same size\n"); WL_ERR("Mask and pattern not the same size\n");
......
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
浏览文件 @ 29750b90
...@@ -28,23 +28,6 @@ struct wl_priv; ...@@ -28,23 +28,6 @@ struct wl_priv;
struct wl_security; struct wl_security;
struct wl_ibss; struct wl_ibss;
#if defined(IL_BIGENDIAN)
#include <bcmendian.h>
#define htod32(i) (bcmswap32(i))
#define htod16(i) (bcmswap16(i))
#define dtoh32(i) (bcmswap32(i))
#define dtoh16(i) (bcmswap16(i))
#define htodchanspec(i) htod16(i)
#define dtohchanspec(i) dtoh16(i)
#else
#define htod32(i) i
#define htod16(i) i
#define dtoh32(i) i
#define dtoh16(i) i
#define htodchanspec(i) i
#define dtohchanspec(i) i
#endif
#define WL_DBG_NONE 0 #define WL_DBG_NONE 0
#define WL_DBG_DBG (1 << 2) #define WL_DBG_DBG (1 << 2)
#define WL_DBG_INFO (1 << 1) #define WL_DBG_INFO (1 << 1)
...@@ -365,7 +348,8 @@ static inline struct wl_bss_info *next_bss(struct wl_scan_results *list, ...@@ -365,7 +348,8 @@ static inline struct wl_bss_info *next_bss(struct wl_scan_results *list,
{ {
return bss = bss ? return bss = bss ?
(struct wl_bss_info *)((unsigned long)bss + (struct wl_bss_info *)((unsigned long)bss +
dtoh32(bss->length)) : list->bss_info; le32_to_cpu(bss->length)) :
list->bss_info;
} }
#define for_each_bss(list, bss, __i) \ #define for_each_bss(list, bss, __i) \
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或