Interworking: Combine identical error returns into a single one
There is no need to maintain separate "return -1;" for each of the wpa_config_set() calls that cannot really fail in practice. Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
c8ae9daf2b
commit
f7c04e50bd
1 changed files with 3 additions and 5 deletions
|
@ -950,11 +950,9 @@ static int interworking_set_hs20_params(struct wpa_supplicant *wpa_s,
|
||||||
if (!key_mgmt)
|
if (!key_mgmt)
|
||||||
key_mgmt = wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ?
|
key_mgmt = wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ?
|
||||||
"WPA-EAP WPA-EAP-SHA256" : "WPA-EAP";
|
"WPA-EAP WPA-EAP-SHA256" : "WPA-EAP";
|
||||||
if (wpa_config_set(ssid, "key_mgmt", key_mgmt, 0) < 0)
|
if (wpa_config_set(ssid, "key_mgmt", key_mgmt, 0) < 0 ||
|
||||||
return -1;
|
wpa_config_set(ssid, "proto", "RSN", 0) < 0 ||
|
||||||
if (wpa_config_set(ssid, "proto", "RSN", 0) < 0)
|
wpa_config_set(ssid, "pairwise", "CCMP", 0) < 0)
|
||||||
return -1;
|
|
||||||
if (wpa_config_set(ssid, "pairwise", "CCMP", 0) < 0)
|
|
||||||
return -1;
|
return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue