DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Use max_remain_on_chan data from nl80211

Browse source 
If the driver advertises max_remain_on_chan data, use it instead of
the hardcoded value of 5000. Keep the default at 5000 since that is the
value used by earlier versions of cfg80211/mac80211 and not advertised
in nl80211 for those.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-02-01 18:18:32 +02:00 • committed by Jouni Malinen
parent 11fb02be67
commit 89e07afb2c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/drivers/driver_nl80211.c
View file

@ -1476,6 +1476,7 @@ struct wiphy_info_data {
int auth_supported; int auth_supported;
int connect_supported; int connect_supported;
int offchan_tx_supported; int offchan_tx_supported;
int max_remain_on_chan;
}; };
@ -1531,6 +1532,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
if (tb[NL80211_ATTR_OFFCHANNEL_TX_OK]) if (tb[NL80211_ATTR_OFFCHANNEL_TX_OK])
info->offchan_tx_supported = 1; info->offchan_tx_supported = 1;
if (tb[NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION])
info->max_remain_on_chan =
nla_get_u32(tb[NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION]);
return NL_SKIP; return NL_SKIP;
} }
@ -1541,6 +1546,10 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,
struct nl_msg *msg; struct nl_msg *msg;
os_memset(info, 0, sizeof(*info)); os_memset(info, 0, sizeof(*info));
/* default to 5000 since early versions of mac80211 don't set it */
info->max_remain_on_chan = 5000;
msg = nlmsg_alloc(); msg = nlmsg_alloc();
if (!msg) if (!msg)
return -1; return -1;
@ -1600,7 +1609,7 @@ static int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv)
drv->capa.flags |= WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE; drv->capa.flags |= WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE;
if (info.p2p_supported) if (info.p2p_supported)
drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE; drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE;
drv->capa.max_remain_on_chan = 5000; drv->capa.max_remain_on_chan = info.max_remain_on_chan;
return 0; return 0;
} }