staging: wilc1000: fix line over 80 characters in host_int_parse_join_bss_param()
Split host_int_parse_join_bss_param() to avoid the line over 80 character issue reported by checkpatch.pl script. Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh
Greg Kroah-Hartman
parent
8d4279c7ee
commit
d4b4aaba51
@ -3827,23 +3827,147 @@ int wilc_setup_multicast_filter(struct wilc_vif *vif, bool enabled,
|
||||
return result;
|
||||
}
|
||||
|
||||
static void *host_int_parse_join_bss_param(struct network_info *info)
|
||||
static void host_int_fill_join_bss_param(struct join_bss_param *param, u8 *ies,
|
||||
u16 *out_index, u8 *pcipher_tc,
|
||||
u8 *auth_total_cnt, u32 tsf_lo)
|
||||
{
|
||||
struct join_bss_param *param = NULL;
|
||||
u8 *ies;
|
||||
u16 ies_len;
|
||||
u16 index = 0;
|
||||
u8 rates_no = 0;
|
||||
u8 ext_rates_no;
|
||||
u16 offset;
|
||||
u8 pcipher_cnt;
|
||||
u8 auth_cnt;
|
||||
u8 i, j;
|
||||
u16 index = *out_index;
|
||||
|
||||
if (ies[index] == SUPP_RATES_IE) {
|
||||
rates_no = ies[index + 1];
|
||||
param->supp_rates[0] = rates_no;
|
||||
index += 2;
|
||||
|
||||
for (i = 0; i < rates_no; i++)
|
||||
param->supp_rates[i + 1] = ies[index + i];
|
||||
|
||||
index += rates_no;
|
||||
} else if (ies[index] == EXT_SUPP_RATES_IE) {
|
||||
ext_rates_no = ies[index + 1];
|
||||
if (ext_rates_no > (MAX_RATES_SUPPORTED - rates_no))
|
||||
param->supp_rates[0] = MAX_RATES_SUPPORTED;
|
||||
else
|
||||
param->supp_rates[0] += ext_rates_no;
|
||||
index += 2;
|
||||
for (i = 0; i < (param->supp_rates[0] - rates_no); i++)
|
||||
param->supp_rates[rates_no + i + 1] = ies[index + i];
|
||||
|
||||
index += ext_rates_no;
|
||||
} else if (ies[index] == HT_CAPABILITY_IE) {
|
||||
param->ht_capable = true;
|
||||
index += ies[index + 1] + 2;
|
||||
} else if ((ies[index] == WMM_IE) &&
|
||||
(ies[index + 2] == 0x00) && (ies[index + 3] == 0x50) &&
|
||||
(ies[index + 4] == 0xF2) && (ies[index + 5] == 0x02) &&
|
||||
((ies[index + 6] == 0x00) || (ies[index + 6] == 0x01)) &&
|
||||
(ies[index + 7] == 0x01)) {
|
||||
param->wmm_cap = true;
|
||||
|
||||
if (ies[index + 8] & BIT(7))
|
||||
param->uapsd_cap = true;
|
||||
index += ies[index + 1] + 2;
|
||||
} else if ((ies[index] == P2P_IE) &&
|
||||
(ies[index + 2] == 0x50) && (ies[index + 3] == 0x6f) &&
|
||||
(ies[index + 4] == 0x9a) &&
|
||||
(ies[index + 5] == 0x09) && (ies[index + 6] == 0x0c)) {
|
||||
u16 p2p_cnt;
|
||||
|
||||
param->tsf = tsf_lo;
|
||||
param->noa_enabled = 1;
|
||||
param->idx = ies[index + 9];
|
||||
|
||||
if (ies[index + 10] & BIT(7)) {
|
||||
param->opp_enabled = 1;
|
||||
param->ct_window = ies[index + 10];
|
||||
} else {
|
||||
param->opp_enabled = 0;
|
||||
}
|
||||
|
||||
param->cnt = ies[index + 11];
|
||||
p2p_cnt = index + 12;
|
||||
|
||||
memcpy(param->duration, ies + p2p_cnt, 4);
|
||||
p2p_cnt += 4;
|
||||
|
||||
memcpy(param->interval, ies + p2p_cnt, 4);
|
||||
p2p_cnt += 4;
|
||||
|
||||
memcpy(param->start_time, ies + p2p_cnt, 4);
|
||||
|
||||
index += ies[index + 1] + 2;
|
||||
} else if ((ies[index] == RSN_IE) ||
|
||||
((ies[index] == WPA_IE) && (ies[index + 2] == 0x00) &&
|
||||
(ies[index + 3] == 0x50) && (ies[index + 4] == 0xF2) &&
|
||||
(ies[index + 5] == 0x01))) {
|
||||
u16 rsn_idx = index;
|
||||
|
||||
if (ies[rsn_idx] == RSN_IE) {
|
||||
param->mode_802_11i = 2;
|
||||
} else {
|
||||
if (param->mode_802_11i == 0)
|
||||
param->mode_802_11i = 1;
|
||||
rsn_idx += 4;
|
||||
}
|
||||
|
||||
rsn_idx += 7;
|
||||
param->rsn_grp_policy = ies[rsn_idx];
|
||||
rsn_idx++;
|
||||
offset = ies[rsn_idx] * 4;
|
||||
pcipher_cnt = (ies[rsn_idx] > 3) ? 3 : ies[rsn_idx];
|
||||
rsn_idx += 2;
|
||||
|
||||
i = *pcipher_tc;
|
||||
j = 0;
|
||||
for (; i < (pcipher_cnt + *pcipher_tc) && i < 3; i++, j++) {
|
||||
u8 *policy = ¶m->rsn_pcip_policy[i];
|
||||
|
||||
*policy = ies[rsn_idx + ((j + 1) * 4) - 1];
|
||||
}
|
||||
|
||||
*pcipher_tc += pcipher_cnt;
|
||||
rsn_idx += offset;
|
||||
|
||||
offset = ies[rsn_idx] * 4;
|
||||
|
||||
auth_cnt = (ies[rsn_idx] > 3) ? 3 : ies[rsn_idx];
|
||||
rsn_idx += 2;
|
||||
i = *auth_total_cnt;
|
||||
j = 0;
|
||||
for (; i < (*auth_total_cnt + auth_cnt); i++, j++) {
|
||||
u8 *policy = ¶m->rsn_auth_policy[i];
|
||||
|
||||
*policy = ies[rsn_idx + ((j + 1) * 4) - 1];
|
||||
}
|
||||
|
||||
auth_total_cnt += auth_cnt;
|
||||
rsn_idx += offset;
|
||||
|
||||
if (ies[index] == RSN_IE) {
|
||||
param->rsn_cap[0] = ies[rsn_idx];
|
||||
param->rsn_cap[1] = ies[rsn_idx + 1];
|
||||
rsn_idx += 2;
|
||||
}
|
||||
param->rsn_found = true;
|
||||
index += ies[index + 1] + 2;
|
||||
} else {
|
||||
index += ies[index + 1] + 2;
|
||||
}
|
||||
|
||||
*out_index = index;
|
||||
}
|
||||
|
||||
static void *host_int_parse_join_bss_param(struct network_info *info)
|
||||
{
|
||||
struct join_bss_param *param = NULL;
|
||||
u16 index = 0;
|
||||
u8 pcipher_total_cnt = 0;
|
||||
u8 auth_total_cnt = 0;
|
||||
u8 i, j;
|
||||
|
||||
ies = info->ies;
|
||||
ies_len = info->ies_len;
|
||||
|
||||
param = kzalloc(sizeof(*param), GFP_KERNEL);
|
||||
if (!param)
|
||||
@ -3858,119 +3982,10 @@ static void *host_int_parse_join_bss_param(struct network_info *info)
|
||||
memset(param->rsn_pcip_policy, 0xFF, 3);
|
||||
memset(param->rsn_auth_policy, 0xFF, 3);
|
||||
|
||||
while (index < ies_len) {
|
||||
if (ies[index] == SUPP_RATES_IE) {
|
||||
rates_no = ies[index + 1];
|
||||
param->supp_rates[0] = rates_no;
|
||||
index += 2;
|
||||
|
||||
for (i = 0; i < rates_no; i++)
|
||||
param->supp_rates[i + 1] = ies[index + i];
|
||||
|
||||
index += rates_no;
|
||||
} else if (ies[index] == EXT_SUPP_RATES_IE) {
|
||||
ext_rates_no = ies[index + 1];
|
||||
if (ext_rates_no > (MAX_RATES_SUPPORTED - rates_no))
|
||||
param->supp_rates[0] = MAX_RATES_SUPPORTED;
|
||||
else
|
||||
param->supp_rates[0] += ext_rates_no;
|
||||
index += 2;
|
||||
for (i = 0; i < (param->supp_rates[0] - rates_no); i++)
|
||||
param->supp_rates[rates_no + i + 1] = ies[index + i];
|
||||
|
||||
index += ext_rates_no;
|
||||
} else if (ies[index] == HT_CAPABILITY_IE) {
|
||||
param->ht_capable = true;
|
||||
index += ies[index + 1] + 2;
|
||||
} else if ((ies[index] == WMM_IE) &&
|
||||
(ies[index + 2] == 0x00) && (ies[index + 3] == 0x50) &&
|
||||
(ies[index + 4] == 0xF2) &&
|
||||
(ies[index + 5] == 0x02) &&
|
||||
((ies[index + 6] == 0x00) || (ies[index + 6] == 0x01)) &&
|
||||
(ies[index + 7] == 0x01)) {
|
||||
param->wmm_cap = true;
|
||||
|
||||
if (ies[index + 8] & BIT(7))
|
||||
param->uapsd_cap = true;
|
||||
index += ies[index + 1] + 2;
|
||||
} else if ((ies[index] == P2P_IE) &&
|
||||
(ies[index + 2] == 0x50) && (ies[index + 3] == 0x6f) &&
|
||||
(ies[index + 4] == 0x9a) &&
|
||||
(ies[index + 5] == 0x09) && (ies[index + 6] == 0x0c)) {
|
||||
u16 p2p_cnt;
|
||||
|
||||
param->tsf = info->tsf_lo;
|
||||
param->noa_enabled = 1;
|
||||
param->idx = ies[index + 9];
|
||||
|
||||
if (ies[index + 10] & BIT(7)) {
|
||||
param->opp_enabled = 1;
|
||||
param->ct_window = ies[index + 10];
|
||||
} else {
|
||||
param->opp_enabled = 0;
|
||||
}
|
||||
|
||||
param->cnt = ies[index + 11];
|
||||
p2p_cnt = index + 12;
|
||||
|
||||
memcpy(param->duration, ies + p2p_cnt, 4);
|
||||
p2p_cnt += 4;
|
||||
|
||||
memcpy(param->interval, ies + p2p_cnt, 4);
|
||||
p2p_cnt += 4;
|
||||
|
||||
memcpy(param->start_time, ies + p2p_cnt, 4);
|
||||
|
||||
index += ies[index + 1] + 2;
|
||||
} else if ((ies[index] == RSN_IE) ||
|
||||
((ies[index] == WPA_IE) && (ies[index + 2] == 0x00) &&
|
||||
(ies[index + 3] == 0x50) && (ies[index + 4] == 0xF2) &&
|
||||
(ies[index + 5] == 0x01))) {
|
||||
u16 rsn_idx = index;
|
||||
|
||||
if (ies[rsn_idx] == RSN_IE) {
|
||||
param->mode_802_11i = 2;
|
||||
} else {
|
||||
if (param->mode_802_11i == 0)
|
||||
param->mode_802_11i = 1;
|
||||
rsn_idx += 4;
|
||||
}
|
||||
|
||||
rsn_idx += 7;
|
||||
param->rsn_grp_policy = ies[rsn_idx];
|
||||
rsn_idx++;
|
||||
offset = ies[rsn_idx] * 4;
|
||||
pcipher_cnt = (ies[rsn_idx] > 3) ? 3 : ies[rsn_idx];
|
||||
rsn_idx += 2;
|
||||
|
||||
for (i = pcipher_total_cnt, j = 0; i < pcipher_cnt + pcipher_total_cnt && i < 3; i++, j++)
|
||||
param->rsn_pcip_policy[i] = ies[rsn_idx + ((j + 1) * 4) - 1];
|
||||
|
||||
pcipher_total_cnt += pcipher_cnt;
|
||||
rsn_idx += offset;
|
||||
|
||||
offset = ies[rsn_idx] * 4;
|
||||
|
||||
auth_cnt = (ies[rsn_idx] > 3) ? 3 : ies[rsn_idx];
|
||||
rsn_idx += 2;
|
||||
|
||||
for (i = auth_total_cnt, j = 0; i < auth_total_cnt + auth_cnt; i++, j++)
|
||||
param->rsn_auth_policy[i] = ies[rsn_idx + ((j + 1) * 4) - 1];
|
||||
|
||||
auth_total_cnt += auth_cnt;
|
||||
rsn_idx += offset;
|
||||
|
||||
if (ies[index] == RSN_IE) {
|
||||
param->rsn_cap[0] = ies[rsn_idx];
|
||||
param->rsn_cap[1] = ies[rsn_idx + 1];
|
||||
rsn_idx += 2;
|
||||
}
|
||||
param->rsn_found = true;
|
||||
index += ies[index + 1] + 2;
|
||||
} else {
|
||||
index += ies[index + 1] + 2;
|
||||
}
|
||||
}
|
||||
while (index < info->ies_len)
|
||||
host_int_fill_join_bss_param(param, info->ies, &index,
|
||||
&pcipher_total_cnt,
|
||||
&auth_total_cnt, info->tsf_lo);
|
||||
|
||||
return (void *)param;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user