jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nl80211: Use a helper function for putting beacon interval

Browse source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-10 13:14:20 +02:00
parent 6dfc55723d
commit 85e1fad8a5
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/drivers/driver_nl80211.c
View file

@ -3168,6 +3168,18 @@ static int wpa_driver_nl80211_set_acl(void *priv,
} }
static int nl80211_put_beacon_int(struct nl_msg *msg, int beacon_int)
{
if (beacon_int > 0) {
wpa_printf(MSG_DEBUG, " * beacon_int=%d", beacon_int);
return nla_put_u32(msg, NL80211_ATTR_BEACON_INTERVAL,
beacon_int);
}
return 0;
}
static int wpa_driver_nl80211_set_ap(void *priv, static int wpa_driver_nl80211_set_ap(void *priv,
struct wpa_driver_ap_params *params) struct wpa_driver_ap_params *params)
{ {
@ -3203,8 +3215,7 @@ static int wpa_driver_nl80211_set_ap(void *priv,
params->head) || params->head) ||
nla_put(msg, NL80211_ATTR_BEACON_TAIL, params->tail_len, nla_put(msg, NL80211_ATTR_BEACON_TAIL, params->tail_len,
params->tail) || params->tail) ||
nla_put_u32(msg, NL80211_ATTR_BEACON_INTERVAL, nl80211_put_beacon_int(msg, params->beacon_int) ||
params->beacon_int) ||
nla_put_u32(msg, NL80211_ATTR_DTIM_PERIOD, params->dtim_period) || nla_put_u32(msg, NL80211_ATTR_DTIM_PERIOD, params->dtim_period) ||
nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid)) nla_put(msg, NL80211_ATTR_SSID, params->ssid_len, params->ssid))
goto fail; goto fail;
@ -4230,16 +4241,10 @@ retry:
os_memcpy(drv->ssid, params->ssid, params->ssid_len); os_memcpy(drv->ssid, params->ssid, params->ssid_len);
drv->ssid_len = params->ssid_len; drv->ssid_len = params->ssid_len;
if (nl80211_put_freq_params(msg, &params->freq) < 0) if (nl80211_put_freq_params(msg, &params->freq) < 0 ||
nl80211_put_beacon_int(msg, params->beacon_int))
goto fail; goto fail;
if (params->beacon_int > 0) {
wpa_printf(MSG_DEBUG, " * beacon_int=%d", params->beacon_int);
if (nla_put_u32(msg, NL80211_ATTR_BEACON_INTERVAL,
params->beacon_int))
goto fail;
}
ret = nl80211_set_conn_keys(params, msg); ret = nl80211_set_conn_keys(params, msg);
if (ret) if (ret)
goto fail; goto fail;
@ -7817,12 +7822,8 @@ wpa_driver_nl80211_join_mesh(void *priv,
goto fail; goto fail;
} }
if (params->beacon_int > 0) { if (nl80211_put_beacon_int(msg, params->beacon_int))
wpa_printf(MSG_DEBUG, " * beacon_int=%d", params->beacon_int); goto fail;
if (nla_put_u32(msg, NL80211_ATTR_BEACON_INTERVAL,
params->beacon_int))
goto fail;
}
wpa_printf(MSG_DEBUG, " * flags=%08X", params->flags); wpa_printf(MSG_DEBUG, " * flags=%08X", params->flags);