Commit 54300bfb authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: fix line over 80 char in handle_connect()

Fix 'line over 80 characters' issue reported by checkpatch.pl script.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03ed9089
...@@ -948,7 +948,8 @@ static s32 handle_connect(struct wilc_vif *vif, ...@@ -948,7 +948,8 @@ static s32 handle_connect(struct wilc_vif *vif,
hif_drv->usr_conn_req.ssid_len = conn_attr->ssid_len; hif_drv->usr_conn_req.ssid_len = conn_attr->ssid_len;
if (conn_attr->ssid) { if (conn_attr->ssid) {
hif_drv->usr_conn_req.ssid = kmalloc(conn_attr->ssid_len + 1, GFP_KERNEL); hif_drv->usr_conn_req.ssid = kmalloc(conn_attr->ssid_len + 1,
GFP_KERNEL);
memcpy(hif_drv->usr_conn_req.ssid, memcpy(hif_drv->usr_conn_req.ssid,
conn_attr->ssid, conn_attr->ssid,
conn_attr->ssid_len); conn_attr->ssid_len);
...@@ -957,7 +958,8 @@ static s32 handle_connect(struct wilc_vif *vif, ...@@ -957,7 +958,8 @@ static s32 handle_connect(struct wilc_vif *vif,
hif_drv->usr_conn_req.ies_len = conn_attr->ies_len; hif_drv->usr_conn_req.ies_len = conn_attr->ies_len;
if (conn_attr->ies) { if (conn_attr->ies) {
hif_drv->usr_conn_req.ies = kmalloc(conn_attr->ies_len, GFP_KERNEL); hif_drv->usr_conn_req.ies = kmalloc(conn_attr->ies_len,
GFP_KERNEL);
memcpy(hif_drv->usr_conn_req.ies, memcpy(hif_drv->usr_conn_req.ies,
conn_attr->ies, conn_attr->ies,
conn_attr->ies_len); conn_attr->ies_len);
...@@ -986,19 +988,17 @@ static s32 handle_connect(struct wilc_vif *vif, ...@@ -986,19 +988,17 @@ static s32 handle_connect(struct wilc_vif *vif,
wid_list[wid_cnt].val = (s8 *)(&(dummyval)); wid_list[wid_cnt].val = (s8 *)(&(dummyval));
wid_cnt++; wid_cnt++;
{ wid_list[wid_cnt].id = WID_INFO_ELEMENT_ASSOCIATE;
wid_list[wid_cnt].id = WID_INFO_ELEMENT_ASSOCIATE; wid_list[wid_cnt].type = WID_BIN_DATA;
wid_list[wid_cnt].type = WID_BIN_DATA; wid_list[wid_cnt].val = hif_drv->usr_conn_req.ies;
wid_list[wid_cnt].val = hif_drv->usr_conn_req.ies; wid_list[wid_cnt].size = hif_drv->usr_conn_req.ies_len;
wid_list[wid_cnt].size = hif_drv->usr_conn_req.ies_len; wid_cnt++;
wid_cnt++;
if (memcmp("DIRECT-", conn_attr->ssid, 7)) {
if (memcmp("DIRECT-", conn_attr->ssid, 7)) { info_element_size = hif_drv->usr_conn_req.ies_len;
info_element_size = hif_drv->usr_conn_req.ies_len; info_element = kmalloc(info_element_size, GFP_KERNEL);
info_element = kmalloc(info_element_size, GFP_KERNEL); memcpy(info_element, hif_drv->usr_conn_req.ies,
memcpy(info_element, hif_drv->usr_conn_req.ies, info_element_size);
info_element_size);
}
} }
wid_list[wid_cnt].id = (u16)WID_11I_MODE; wid_list[wid_cnt].id = (u16)WID_11I_MODE;
wid_list[wid_cnt].type = WID_CHAR; wid_list[wid_cnt].type = WID_CHAR;
...@@ -1075,10 +1075,12 @@ static s32 handle_connect(struct wilc_vif *vif, ...@@ -1075,10 +1075,12 @@ static s32 handle_connect(struct wilc_vif *vif,
*(cur_byte++) = bss_param->rsn_grp_policy; *(cur_byte++) = bss_param->rsn_grp_policy;
*(cur_byte++) = bss_param->mode_802_11i; *(cur_byte++) = bss_param->mode_802_11i;
memcpy(cur_byte, bss_param->rsn_pcip_policy, sizeof(bss_param->rsn_pcip_policy)); memcpy(cur_byte, bss_param->rsn_pcip_policy,
sizeof(bss_param->rsn_pcip_policy));
cur_byte += sizeof(bss_param->rsn_pcip_policy); cur_byte += sizeof(bss_param->rsn_pcip_policy);
memcpy(cur_byte, bss_param->rsn_auth_policy, sizeof(bss_param->rsn_auth_policy)); memcpy(cur_byte, bss_param->rsn_auth_policy,
sizeof(bss_param->rsn_auth_policy));
cur_byte += sizeof(bss_param->rsn_auth_policy); cur_byte += sizeof(bss_param->rsn_auth_policy);
memcpy(cur_byte, bss_param->rsn_cap, sizeof(bss_param->rsn_cap)); memcpy(cur_byte, bss_param->rsn_cap, sizeof(bss_param->rsn_cap));
...@@ -1101,13 +1103,16 @@ static s32 handle_connect(struct wilc_vif *vif, ...@@ -1101,13 +1103,16 @@ static s32 handle_connect(struct wilc_vif *vif,
*(cur_byte++) = bss_param->cnt; *(cur_byte++) = bss_param->cnt;
memcpy(cur_byte, bss_param->duration, sizeof(bss_param->duration)); memcpy(cur_byte, bss_param->duration,
sizeof(bss_param->duration));
cur_byte += sizeof(bss_param->duration); cur_byte += sizeof(bss_param->duration);
memcpy(cur_byte, bss_param->interval, sizeof(bss_param->interval)); memcpy(cur_byte, bss_param->interval,
sizeof(bss_param->interval));
cur_byte += sizeof(bss_param->interval); cur_byte += sizeof(bss_param->interval);
memcpy(cur_byte, bss_param->start_time, sizeof(bss_param->start_time)); memcpy(cur_byte, bss_param->start_time,
sizeof(bss_param->start_time));
cur_byte += sizeof(bss_param->start_time); cur_byte += sizeof(bss_param->start_time);
} }
...@@ -1148,7 +1153,8 @@ static s32 handle_connect(struct wilc_vif *vif, ...@@ -1148,7 +1153,8 @@ static s32 handle_connect(struct wilc_vif *vif,
if (conn_attr->ies) { if (conn_attr->ies) {
conn_info.req_ies_len = conn_attr->ies_len; conn_info.req_ies_len = conn_attr->ies_len;
conn_info.req_ies = kmalloc(conn_attr->ies_len, GFP_KERNEL); conn_info.req_ies = kmalloc(conn_attr->ies_len,
GFP_KERNEL);
memcpy(conn_info.req_ies, memcpy(conn_info.req_ies,
conn_attr->ies, conn_attr->ies,
conn_attr->ies_len); conn_attr->ies_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment