diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 8ec33b36ad71..8528ff813e6b 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -2061,40 +2061,38 @@ static void handle_del_beacon(struct wilc_vif *vif) } static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, - struct add_sta_param *pstrStationParam) + struct add_sta_param *param) { u8 *cur_byte; cur_byte = pu8Buffer; - memcpy(cur_byte, pstrStationParam->bssid, ETH_ALEN); + memcpy(cur_byte, param->bssid, ETH_ALEN); cur_byte += ETH_ALEN; - *cur_byte++ = pstrStationParam->aid & 0xFF; - *cur_byte++ = (pstrStationParam->aid >> 8) & 0xFF; + *cur_byte++ = param->aid & 0xFF; + *cur_byte++ = (param->aid >> 8) & 0xFF; - *cur_byte++ = pstrStationParam->rates_len; - if (pstrStationParam->rates_len > 0) - memcpy(cur_byte, pstrStationParam->rates, - pstrStationParam->rates_len); - cur_byte += pstrStationParam->rates_len; + *cur_byte++ = param->rates_len; + if (param->rates_len > 0) + memcpy(cur_byte, param->rates, param->rates_len); + cur_byte += param->rates_len; - *cur_byte++ = pstrStationParam->ht_supported; - memcpy(cur_byte, &pstrStationParam->ht_capa, - sizeof(struct ieee80211_ht_cap)); + *cur_byte++ = param->ht_supported; + memcpy(cur_byte, ¶m->ht_capa, sizeof(struct ieee80211_ht_cap)); cur_byte += sizeof(struct ieee80211_ht_cap); - *cur_byte++ = pstrStationParam->flags_mask & 0xFF; - *cur_byte++ = (pstrStationParam->flags_mask >> 8) & 0xFF; + *cur_byte++ = param->flags_mask & 0xFF; + *cur_byte++ = (param->flags_mask >> 8) & 0xFF; - *cur_byte++ = pstrStationParam->flags_set & 0xFF; - *cur_byte++ = (pstrStationParam->flags_set >> 8) & 0xFF; + *cur_byte++ = param->flags_set & 0xFF; + *cur_byte++ = (param->flags_set >> 8) & 0xFF; return cur_byte - pu8Buffer; } static void handle_add_station(struct wilc_vif *vif, - struct add_sta_param *pstrStationParam) + struct add_sta_param *param) { s32 result = 0; struct wid wid; @@ -2102,14 +2100,14 @@ static void handle_add_station(struct wilc_vif *vif, wid.id = (u16)WID_ADD_STA; wid.type = WID_BIN; - wid.size = WILC_ADD_STA_LENGTH + pstrStationParam->rates_len; + wid.size = WILC_ADD_STA_LENGTH + param->rates_len; wid.val = kmalloc(wid.size, GFP_KERNEL); if (!wid.val) goto ERRORHANDLER; cur_byte = wid.val; - cur_byte += WILC_HostIf_PackStaParam(cur_byte, pstrStationParam); + cur_byte += WILC_HostIf_PackStaParam(cur_byte, param); result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); @@ -2117,7 +2115,7 @@ static void handle_add_station(struct wilc_vif *vif, netdev_err(vif->ndev, "Failed to send add station\n"); ERRORHANDLER: - kfree(pstrStationParam->rates); + kfree(param->rates); kfree(wid.val); } @@ -2190,7 +2188,7 @@ ERRORHANDLER: } static void handle_edit_station(struct wilc_vif *vif, - struct add_sta_param *pstrStationParam) + struct add_sta_param *param) { s32 result = 0; struct wid wid; @@ -2198,14 +2196,14 @@ static void handle_edit_station(struct wilc_vif *vif, wid.id = (u16)WID_EDIT_STA; wid.type = WID_BIN; - wid.size = WILC_ADD_STA_LENGTH + pstrStationParam->rates_len; + wid.size = WILC_ADD_STA_LENGTH + param->rates_len; wid.val = kmalloc(wid.size, GFP_KERNEL); if (!wid.val) goto ERRORHANDLER; cur_byte = wid.val; - cur_byte += WILC_HostIf_PackStaParam(cur_byte, pstrStationParam); + cur_byte += WILC_HostIf_PackStaParam(cur_byte, param); result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); @@ -2213,7 +2211,7 @@ static void handle_edit_station(struct wilc_vif *vif, netdev_err(vif->ndev, "Failed to send edit station\n"); ERRORHANDLER: - kfree(pstrStationParam->rates); + kfree(param->rates); kfree(wid.val); } |