staging: wilc1000: rename u8KeyIdx in host_int_add_rx_gtk
[deliverable/linux.git] / drivers / staging / wilc1000 / host_interface.c
index 7014915e30d1e0a9bd4483867140e4a2a41f2315..22fdca597e4a042b7ec5868c8deb88d4743b27af 100644 (file)
@@ -323,7 +323,7 @@ static struct host_if_drv *get_handler_from_id(int id)
        return wfidrv_list[id];
 }
 
-static s32 Handle_SetChannel(struct host_if_drv *hif_drv,
+static s32 handle_set_channel(struct host_if_drv *hif_drv,
                              struct channel_attr *hif_set_ch)
 {
        s32 result = 0;
@@ -347,8 +347,8 @@ static s32 Handle_SetChannel(struct host_if_drv *hif_drv,
        return result;
 }
 
-static s32 Handle_SetWfiDrvHandler(struct host_if_drv *hif_drv,
-                                   struct drv_handler *hif_drv_handler)
+static s32 handle_set_wfi_drv_handler(struct host_if_drv *hif_drv,
+                                     struct drv_handler *hif_drv_handler)
 {
        s32 result = 0;
        struct wid wid;
@@ -371,8 +371,8 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv *hif_drv,
        return result;
 }
 
-static s32 Handle_SetOperationMode(struct host_if_drv *hif_drv,
-                                   struct op_mode *hif_op_mode)
+static s32 handle_set_operation_mode(struct host_if_drv *hif_drv,
+                                    struct op_mode *hif_op_mode)
 {
        s32 result = 0;
        struct wid wid;
@@ -396,7 +396,7 @@ static s32 Handle_SetOperationMode(struct host_if_drv *hif_drv,
        return result;
 }
 
-s32 Handle_set_IPAddress(struct host_if_drv *hif_drv, u8 *ip_addr, u8 idx)
+s32 handle_set_ip_address(struct host_if_drv *hif_drv, u8 *ip_addr, u8 idx)
 {
        s32 result = 0;
        struct wid wid;
@@ -430,7 +430,7 @@ s32 Handle_set_IPAddress(struct host_if_drv *hif_drv, u8 *ip_addr, u8 idx)
        return result;
 }
 
-s32 Handle_get_IPAddress(struct host_if_drv *hif_drv, u8 idx)
+s32 handle_get_ip_address(struct host_if_drv *hif_drv, u8 idx)
 {
        s32 result = 0;
        struct wid wid;
@@ -464,8 +464,8 @@ s32 Handle_get_IPAddress(struct host_if_drv *hif_drv, u8 idx)
        return result;
 }
 
-static s32 Handle_SetMacAddress(struct host_if_drv *hif_drv,
-                               struct set_mac_addr *set_mac_addr)
+static s32 handle_set_mac_address(struct host_if_drv *hif_drv,
+                                 struct set_mac_addr *set_mac_addr)
 {
        s32 result = 0;
        struct wid wid;
@@ -494,8 +494,8 @@ static s32 Handle_SetMacAddress(struct host_if_drv *hif_drv,
        return result;
 }
 
-static s32 Handle_GetMacAddress(struct host_if_drv *hif_drv,
-                               struct get_mac_addr *get_mac_addr)
+static s32 handle_get_mac_address(struct host_if_drv *hif_drv,
+                                 struct get_mac_addr *get_mac_addr)
 {
        s32 result = 0;
        struct wid wid;
@@ -517,12 +517,12 @@ static s32 Handle_GetMacAddress(struct host_if_drv *hif_drv,
        return result;
 }
 
-static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
-                          struct cfg_param_attr *cfg_param_attr)
+static s32 handle_cfg_param(struct host_if_drv *hif_drv,
+                           struct cfg_param_attr *cfg_param_attr)
 {
        s32 result = 0;
-       struct wid strWIDList[32];
-       u8 u8WidCnt = 0;
+       struct wid wid_list[32];
+       u8 wid_cnt = 0;
 
        down(&hif_drv->sem_cfg_values);
 
@@ -530,254 +530,253 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
 
        if (cfg_param_attr->cfg_attr_info.flag & BSS_TYPE) {
                if (cfg_param_attr->cfg_attr_info.bss_type < 6) {
-                       strWIDList[u8WidCnt].id = WID_BSS_TYPE;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.bss_type;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_BSS_TYPE;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.bss_type;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.bss_type = (u8)cfg_param_attr->cfg_attr_info.bss_type;
                } else {
                        PRINT_ER("check value 6 over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & AUTH_TYPE) {
                if (cfg_param_attr->cfg_attr_info.auth_type == 1 ||
                    cfg_param_attr->cfg_attr_info.auth_type == 2 ||
                    cfg_param_attr->cfg_attr_info.auth_type == 5) {
-                       strWIDList[u8WidCnt].id = WID_AUTH_TYPE;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.auth_type;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_AUTH_TYPE;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.auth_type;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.auth_type = (u8)cfg_param_attr->cfg_attr_info.auth_type;
                } else {
                        PRINT_ER("Impossible value \n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & AUTHEN_TIMEOUT) {
                if (cfg_param_attr->cfg_attr_info.auth_timeout > 0 &&
                    cfg_param_attr->cfg_attr_info.auth_timeout < 65536) {
-                       strWIDList[u8WidCnt].id = WID_AUTH_TIMEOUT;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.auth_timeout;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_AUTH_TIMEOUT;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.auth_timeout;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.auth_timeout = cfg_param_attr->cfg_attr_info.auth_timeout;
                } else {
                        PRINT_ER("Range(1 ~ 65535) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & POWER_MANAGEMENT) {
                if (cfg_param_attr->cfg_attr_info.power_mgmt_mode < 5) {
-                       strWIDList[u8WidCnt].id = WID_POWER_MANAGEMENT;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.power_mgmt_mode;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_POWER_MANAGEMENT;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.power_mgmt_mode;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.power_mgmt_mode = (u8)cfg_param_attr->cfg_attr_info.power_mgmt_mode;
                } else {
                        PRINT_ER("Invalide power mode\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & RETRY_SHORT) {
                if (cfg_param_attr->cfg_attr_info.short_retry_limit > 0 &&
                    cfg_param_attr->cfg_attr_info.short_retry_limit < 256) {
-                       strWIDList[u8WidCnt].id = WID_SHORT_RETRY_LIMIT;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.short_retry_limit;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_SHORT_RETRY_LIMIT;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.short_retry_limit;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.short_retry_limit = cfg_param_attr->cfg_attr_info.short_retry_limit;
                } else {
                        PRINT_ER("Range(1~256) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & RETRY_LONG) {
                if (cfg_param_attr->cfg_attr_info.long_retry_limit > 0 &&
                    cfg_param_attr->cfg_attr_info.long_retry_limit < 256) {
-                       strWIDList[u8WidCnt].id = WID_LONG_RETRY_LIMIT;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.long_retry_limit;
-
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_LONG_RETRY_LIMIT;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.long_retry_limit;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.long_retry_limit = cfg_param_attr->cfg_attr_info.long_retry_limit;
                } else {
                        PRINT_ER("Range(1~256) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & FRAG_THRESHOLD) {
                if (cfg_param_attr->cfg_attr_info.frag_threshold > 255 &&
                    cfg_param_attr->cfg_attr_info.frag_threshold < 7937) {
-                       strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.frag_threshold;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_FRAG_THRESHOLD;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.frag_threshold;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.frag_threshold = cfg_param_attr->cfg_attr_info.frag_threshold;
                } else {
                        PRINT_ER("Threshold Range fail\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & RTS_THRESHOLD) {
                if (cfg_param_attr->cfg_attr_info.rts_threshold > 255 &&
                    cfg_param_attr->cfg_attr_info.rts_threshold < 65536) {
-                       strWIDList[u8WidCnt].id = WID_RTS_THRESHOLD;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.rts_threshold;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_RTS_THRESHOLD;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.rts_threshold;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.rts_threshold = cfg_param_attr->cfg_attr_info.rts_threshold;
                } else {
                        PRINT_ER("Threshold Range fail\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & PREAMBLE) {
                if (cfg_param_attr->cfg_attr_info.preamble_type < 3) {
-                       strWIDList[u8WidCnt].id = WID_PREAMBLE;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.preamble_type;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_PREAMBLE;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.preamble_type;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.preamble_type = cfg_param_attr->cfg_attr_info.preamble_type;
                } else {
                        PRINT_ER("Preamle Range(0~2) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & SHORT_SLOT_ALLOWED) {
                if (cfg_param_attr->cfg_attr_info.short_slot_allowed < 2) {
-                       strWIDList[u8WidCnt].id = WID_SHORT_SLOT_ALLOWED;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.short_slot_allowed;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_SHORT_SLOT_ALLOWED;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.short_slot_allowed;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.short_slot_allowed = (u8)cfg_param_attr->cfg_attr_info.short_slot_allowed;
                } else {
                        PRINT_ER("Short slot(2) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & TXOP_PROT_DISABLE) {
                if (cfg_param_attr->cfg_attr_info.txop_prot_disabled < 2) {
-                       strWIDList[u8WidCnt].id = WID_11N_TXOP_PROT_DISABLE;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.txop_prot_disabled;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_11N_TXOP_PROT_DISABLE;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.txop_prot_disabled;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.txop_prot_disabled = (u8)cfg_param_attr->cfg_attr_info.txop_prot_disabled;
                } else {
                        PRINT_ER("TXOP prot disable\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & BEACON_INTERVAL) {
                if (cfg_param_attr->cfg_attr_info.beacon_interval > 0 &&
                    cfg_param_attr->cfg_attr_info.beacon_interval < 65536) {
-                       strWIDList[u8WidCnt].id = WID_BEACON_INTERVAL;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.beacon_interval;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_BEACON_INTERVAL;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.beacon_interval;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.beacon_interval = cfg_param_attr->cfg_attr_info.beacon_interval;
                } else {
                        PRINT_ER("Beacon interval(1~65535) fail\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & DTIM_PERIOD) {
                if (cfg_param_attr->cfg_attr_info.dtim_period > 0 &&
                    cfg_param_attr->cfg_attr_info.dtim_period < 256) {
-                       strWIDList[u8WidCnt].id = WID_DTIM_PERIOD;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.dtim_period;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_DTIM_PERIOD;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.dtim_period;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.dtim_period = cfg_param_attr->cfg_attr_info.dtim_period;
                } else {
                        PRINT_ER("DTIM range(1~255) fail\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & SITE_SURVEY) {
                if (cfg_param_attr->cfg_attr_info.site_survey_enabled < 3) {
-                       strWIDList[u8WidCnt].id = WID_SITE_SURVEY;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.site_survey_enabled;
-                       strWIDList[u8WidCnt].type = WID_CHAR;
-                       strWIDList[u8WidCnt].size = sizeof(char);
+                       wid_list[wid_cnt].id = WID_SITE_SURVEY;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.site_survey_enabled;
+                       wid_list[wid_cnt].type = WID_CHAR;
+                       wid_list[wid_cnt].size = sizeof(char);
                        hif_drv->cfg_values.site_survey_enabled = (u8)cfg_param_attr->cfg_attr_info.site_survey_enabled;
                } else {
                        PRINT_ER("Site survey disable\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & SITE_SURVEY_SCAN_TIME) {
                if (cfg_param_attr->cfg_attr_info.site_survey_scan_time > 0 &&
                    cfg_param_attr->cfg_attr_info.site_survey_scan_time < 65536) {
-                       strWIDList[u8WidCnt].id = WID_SITE_SURVEY_SCAN_TIME;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.site_survey_scan_time;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_SITE_SURVEY_SCAN_TIME;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.site_survey_scan_time;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.site_survey_scan_time = cfg_param_attr->cfg_attr_info.site_survey_scan_time;
                } else {
                        PRINT_ER("Site survey scan time(1~65535) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & ACTIVE_SCANTIME) {
                if (cfg_param_attr->cfg_attr_info.active_scan_time > 0 &&
                    cfg_param_attr->cfg_attr_info.active_scan_time < 65536) {
-                       strWIDList[u8WidCnt].id = WID_ACTIVE_SCAN_TIME;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.active_scan_time;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_ACTIVE_SCAN_TIME;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.active_scan_time;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.active_scan_time = cfg_param_attr->cfg_attr_info.active_scan_time;
                } else {
                        PRINT_ER("Active scan time(1~65535) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & PASSIVE_SCANTIME) {
                if (cfg_param_attr->cfg_attr_info.passive_scan_time > 0 &&
                    cfg_param_attr->cfg_attr_info.passive_scan_time < 65536) {
-                       strWIDList[u8WidCnt].id = WID_PASSIVE_SCAN_TIME;
-                       strWIDList[u8WidCnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.passive_scan_time;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_PASSIVE_SCAN_TIME;
+                       wid_list[wid_cnt].val = (s8 *)&cfg_param_attr->cfg_attr_info.passive_scan_time;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.passive_scan_time = cfg_param_attr->cfg_attr_info.passive_scan_time;
                } else {
                        PRINT_ER("Passive scan time(1~65535) over\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
        if (cfg_param_attr->cfg_attr_info.flag & CURRENT_TX_RATE) {
                enum CURRENT_TXRATE curr_tx_rate = cfg_param_attr->cfg_attr_info.curr_tx_rate;
@@ -788,20 +787,20 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
                    || curr_tx_rate == MBPS_9 || curr_tx_rate == MBPS_12
                    || curr_tx_rate == MBPS_18 || curr_tx_rate == MBPS_24
                    || curr_tx_rate == MBPS_36 || curr_tx_rate == MBPS_48 || curr_tx_rate == MBPS_54) {
-                       strWIDList[u8WidCnt].id = WID_CURRENT_TX_RATE;
-                       strWIDList[u8WidCnt].val = (s8 *)&curr_tx_rate;
-                       strWIDList[u8WidCnt].type = WID_SHORT;
-                       strWIDList[u8WidCnt].size = sizeof(u16);
+                       wid_list[wid_cnt].id = WID_CURRENT_TX_RATE;
+                       wid_list[wid_cnt].val = (s8 *)&curr_tx_rate;
+                       wid_list[wid_cnt].type = WID_SHORT;
+                       wid_list[wid_cnt].size = sizeof(u16);
                        hif_drv->cfg_values.curr_tx_rate = (u8)curr_tx_rate;
                } else {
                        PRINT_ER("out of TX rate\n");
                        result = -EINVAL;
                        goto ERRORHANDLER;
                }
-               u8WidCnt++;
+               wid_cnt++;
        }
 
-       result = send_config_pkt(SET_CFG, strWIDList, u8WidCnt,
+       result = send_config_pkt(SET_CFG, wid_list, wid_cnt,
                                 get_id_from_handler(hif_drv));
 
        if (result)
@@ -2888,12 +2887,11 @@ static int hostIFthread(void *pvArg)
                        break;
 
                case HOST_IF_MSG_CFG_PARAMS:
-
-                       Handle_CfgParam(msg.drv, &msg.body.cfg_info);
+                       handle_cfg_param(msg.drv, &msg.body.cfg_info);
                        break;
 
                case HOST_IF_MSG_SET_CHANNEL:
-                       Handle_SetChannel(msg.drv, &msg.body.channel_info);
+                       handle_set_channel(msg.drv, &msg.body.channel_info);
                        break;
 
                case HOST_IF_MSG_DISCONNECT:
@@ -2970,30 +2968,33 @@ static int hostIFthread(void *pvArg)
                        break;
 
                case HOST_IF_MSG_SET_WFIDRV_HANDLER:
-                       Handle_SetWfiDrvHandler(msg.drv,
-                                               &msg.body.drv);
+                       handle_set_wfi_drv_handler(msg.drv, &msg.body.drv);
                        break;
 
                case HOST_IF_MSG_SET_OPERATION_MODE:
-                       Handle_SetOperationMode(msg.drv, &msg.body.mode);
+                       handle_set_operation_mode(msg.drv, &msg.body.mode);
                        break;
 
                case HOST_IF_MSG_SET_IPADDRESS:
                        PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_IPADDRESS\n");
-                       Handle_set_IPAddress(msg.drv, msg.body.ip_info.ip_addr, msg.body.ip_info.idx);
+                       handle_set_ip_address(msg.drv,
+                                             msg.body.ip_info.ip_addr,
+                                             msg.body.ip_info.idx);
                        break;
 
                case HOST_IF_MSG_GET_IPADDRESS:
                        PRINT_D(HOSTINF_DBG, "HOST_IF_MSG_SET_IPADDRESS\n");
-                       Handle_get_IPAddress(msg.drv, msg.body.ip_info.idx);
+                       handle_get_ip_address(msg.drv, msg.body.ip_info.idx);
                        break;
 
                case HOST_IF_MSG_SET_MAC_ADDRESS:
-                       Handle_SetMacAddress(msg.drv, &msg.body.set_mac_info);
+                       handle_set_mac_address(msg.drv,
+                                              &msg.body.set_mac_info);
                        break;
 
                case HOST_IF_MSG_GET_MAC_ADDRESS:
-                       Handle_GetMacAddress(msg.drv, &msg.body.get_mac_info);
+                       handle_get_mac_address(msg.drv,
+                                              &msg.body.get_mac_info);
                        break;
 
                case HOST_IF_MSG_REMAIN_ON_CHAN:
@@ -3206,26 +3207,26 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv,
        return result;
 }
 
-s32 host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
-                    u8 u8PtkKeylen, const u8 *mac_addr,
-                    const u8 *pu8RxMic, const u8 *pu8TxMic,
-                    u8 mode, u8 u8Ciphermode, u8 u8Idx)
+int host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *ptk,
+                    u8 ptk_key_len, const u8 *mac_addr,
+                    const u8 *rx_mic, const u8 *tx_mic,
+                    u8 mode, u8 cipher_mode, u8 index)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
-       u8 u8KeyLen = u8PtkKeylen;
-       u32 i;
+       u8 key_len = ptk_key_len;
+       int i;
 
        if (!hif_drv) {
                PRINT_ER("driver is null\n");
                return -EFAULT;
        }
 
-       if (pu8RxMic)
-               u8KeyLen += RX_MIC_KEY_LEN;
+       if (rx_mic)
+               key_len += RX_MIC_KEY_LEN;
 
-       if (pu8TxMic)
-               u8KeyLen += TX_MIC_KEY_LEN;
+       if (tx_mic)
+               key_len += TX_MIC_KEY_LEN;
 
        memset(&msg, 0, sizeof(struct host_if_msg));
 
@@ -3233,32 +3234,33 @@ s32 host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
        msg.body.key_info.type = WPA_PTK;
        if (mode == AP_MODE) {
                msg.body.key_info.action = ADDKEY_AP;
-               msg.body.key_info.attr.wpa.index = u8Idx;
+               msg.body.key_info.attr.wpa.index = index;
        }
        if (mode == STATION_MODE)
                msg.body.key_info.action = ADDKEY;
 
-       msg.body.key_info.attr.wpa.key = kmalloc(u8PtkKeylen, GFP_KERNEL);
-       memcpy(msg.body.key_info.attr.wpa.key, pu8Ptk, u8PtkKeylen);
+       msg.body.key_info.attr.wpa.key = kmemdup(ptk, ptk_key_len, GFP_KERNEL);
+       if (!msg.body.key_info.attr.wpa.key)
+               return -ENOMEM;
 
-       if (pu8RxMic) {
-               memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic, RX_MIC_KEY_LEN);
+       if (rx_mic) {
+               memcpy(msg.body.key_info.attr.wpa.key + 16, rx_mic, RX_MIC_KEY_LEN);
                if (INFO) {
                        for (i = 0; i < RX_MIC_KEY_LEN; i++)
-                               PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, pu8RxMic[i]);
+                               PRINT_INFO(CFG80211_DBG, "PairwiseRx[%d] = %x\n", i, rx_mic[i]);
                }
        }
-       if (pu8TxMic) {
-               memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic, TX_MIC_KEY_LEN);
+       if (tx_mic) {
+               memcpy(msg.body.key_info.attr.wpa.key + 24, tx_mic, TX_MIC_KEY_LEN);
                if (INFO) {
                        for (i = 0; i < TX_MIC_KEY_LEN; i++)
-                               PRINT_INFO(CFG80211_DBG, "PairwiseTx[%d] = %x\n", i, pu8TxMic[i]);
+                               PRINT_INFO(CFG80211_DBG, "PairwiseTx[%d] = %x\n", i, tx_mic[i]);
                }
        }
 
-       msg.body.key_info.attr.wpa.key_len = u8KeyLen;
+       msg.body.key_info.attr.wpa.key_len = key_len;
        msg.body.key_info.attr.wpa.mac_addr = mac_addr;
-       msg.body.key_info.attr.wpa.mode = u8Ciphermode;
+       msg.body.key_info.attr.wpa.mode = cipher_mode;
        msg.drv = hif_drv;
 
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
@@ -3271,15 +3273,15 @@ s32 host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
        return result;
 }
 
-s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
-                       u8 u8GtkKeylen, u8 u8KeyIdx,
+int host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *rx_gtk,
+                       u8 gtk_key_len, u8 index,
                        u32 u32KeyRSClen, const u8 *KeyRSC,
                        const u8 *pu8RxMic, const u8 *pu8TxMic,
                        u8 mode, u8 u8Ciphermode)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
-       u8 u8KeyLen = u8GtkKeylen;
+       u8 u8KeyLen = gtk_key_len;
 
        if (!hif_drv) {
                PRINT_ER("driver is null\n");
@@ -3310,7 +3312,7 @@ s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
                msg.body.key_info.action = ADDKEY;
 
        msg.body.key_info.attr.wpa.key = kmalloc(u8KeyLen, GFP_KERNEL);
-       memcpy(msg.body.key_info.attr.wpa.key, pu8RxGtk, u8GtkKeylen);
+       memcpy(msg.body.key_info.attr.wpa.key, rx_gtk, gtk_key_len);
 
        if (pu8RxMic)
                memcpy(msg.body.key_info.attr.wpa.key + 16, pu8RxMic,
@@ -3320,7 +3322,7 @@ s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
                memcpy(msg.body.key_info.attr.wpa.key + 24, pu8TxMic,
                       TX_MIC_KEY_LEN);
 
-       msg.body.key_info.attr.wpa.index = u8KeyIdx;
+       msg.body.key_info.attr.wpa.index = index;
        msg.body.key_info.attr.wpa.key_len = u8KeyLen;
        msg.body.key_info.attr.wpa.seq_len = u32KeyRSClen;
 
@@ -4517,9 +4519,9 @@ ERRORHANDLER:
        return result;
 }
 
-s32 host_int_del_beacon(struct host_if_drv *hif_drv)
+int host_int_del_beacon(struct host_if_drv *hif_drv)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
 
        if (!hif_drv) {
@@ -4538,12 +4540,12 @@ s32 host_int_del_beacon(struct host_if_drv *hif_drv)
        return result;
 }
 
-s32 host_int_add_station(struct host_if_drv *hif_drv,
-                        struct add_sta_param *pstrStaParams)
+int host_int_add_station(struct host_if_drv *hif_drv,
+                        struct add_sta_param *sta_param)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
-       struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info;
+       struct add_sta_param *add_sta_info = &msg.body.add_sta_info;
 
        if (!hif_drv) {
                PRINT_ER("driver is null\n");
@@ -4557,16 +4559,13 @@ s32 host_int_add_station(struct host_if_drv *hif_drv,
        msg.id = HOST_IF_MSG_ADD_STATION;
        msg.drv = hif_drv;
 
-       memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
-       if (pstrAddStationMsg->rates_len > 0) {
-               u8 *rates = kmalloc(pstrAddStationMsg->rates_len, GFP_KERNEL);
-
-               if (!rates)
+       memcpy(add_sta_info, sta_param, sizeof(struct add_sta_param));
+       if (add_sta_info->rates_len > 0) {
+               add_sta_info->rates = kmemdup(sta_param->rates,
+                                     add_sta_info->rates_len,
+                                     GFP_KERNEL);
+               if (!add_sta_info->rates)
                        return -ENOMEM;
-
-               memcpy(rates, pstrStaParams->rates,
-                      pstrAddStationMsg->rates_len);
-               pstrAddStationMsg->rates = rates;
        }
 
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
@@ -4575,11 +4574,11 @@ s32 host_int_add_station(struct host_if_drv *hif_drv,
        return result;
 }
 
-s32 host_int_del_station(struct host_if_drv *hif_drv, const u8 *pu8MacAddr)
+int host_int_del_station(struct host_if_drv *hif_drv, const u8 *mac_addr)
 {
-       s32 result = 0;
+       int result = 0;
        struct host_if_msg msg;
-       struct del_sta *pstrDelStationMsg = &msg.body.del_sta_info;
+       struct del_sta *del_sta_info = &msg.body.del_sta_info;
 
        if (!hif_drv) {
                PRINT_ER("driver is null\n");
@@ -4593,10 +4592,10 @@ s32 host_int_del_station(struct host_if_drv *hif_drv, const u8 *pu8MacAddr)
        msg.id = HOST_IF_MSG_DEL_STATION;
        msg.drv = hif_drv;
 
-       if (!pu8MacAddr)
-               eth_broadcast_addr(pstrDelStationMsg->mac_addr);
+       if (!mac_addr)
+               eth_broadcast_addr(del_sta_info->mac_addr);
        else
-               memcpy(pstrDelStationMsg->mac_addr, pu8MacAddr, ETH_ALEN);
+               memcpy(del_sta_info->mac_addr, mac_addr, ETH_ALEN);
 
        result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
        if (result)
This page took 0.039189 seconds and 5 git commands to generate.