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

nl80211: Add support for changing AP mode channel bandwidth

Browse source 
Configure driver with the new channel parameters (mainly, HT 20/40 MHz
bandwidth changes) as part of set_ap().

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Peng Xu 2014-04-14 20:51:32 +03:00 committed by Jouni Malinen
parent 30575183f6
commit e87ef7517e
1 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/drivers/driver_nl80211.c
View file

@ -236,6 +236,7 @@ struct i802_bss {
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
int freq; int freq;
int bandwidth;
int if_dynamic; int if_dynamic;
void *ctx; void *ctx;
@ -386,6 +387,8 @@ static int wpa_driver_nl80211_if_remove(struct i802_bss *bss,
enum wpa_driver_if_type type, enum wpa_driver_if_type type,
const char *ifname); const char *ifname);
static int nl80211_set_channel(struct i802_bss *bss,
struct hostapd_freq_params *freq, int set_chan);
static int wpa_driver_nl80211_set_freq(struct i802_bss *bss, static int wpa_driver_nl80211_set_freq(struct i802_bss *bss,
struct hostapd_freq_params *freq); struct hostapd_freq_params *freq);
static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv, static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
@ -3657,6 +3660,9 @@ static void wiphy_info_feature_flags(struct wiphy_info_data *info,
if (flags & NL80211_FEATURE_NEED_OBSS_SCAN) if (flags & NL80211_FEATURE_NEED_OBSS_SCAN)
capa->flags |= WPA_DRIVER_FLAGS_OBSS_SCAN; capa->flags |= WPA_DRIVER_FLAGS_OBSS_SCAN;
if (flags & NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE)
capa->flags |= WPA_DRIVER_FLAGS_HT_2040_COEX;
} }
@ -7300,6 +7306,30 @@ static int wpa_driver_nl80211_set_ap(void *priv,
nl80211_set_bss(bss, params->cts_protect, params->preamble, nl80211_set_bss(bss, params->cts_protect, params->preamble,
params->short_slot_time, params->ht_opmode, params->short_slot_time, params->ht_opmode,
params->isolate, params->basic_rates); params->isolate, params->basic_rates);
if (beacon_set && params->freq &&
params->freq->bandwidth != bss->bandwidth) {
wpa_printf(MSG_DEBUG,
"nl80211: Update BSS %s bandwidth: %d -> %d",
bss->ifname, bss->bandwidth,
params->freq->bandwidth);
ret = nl80211_set_channel(bss, params->freq, 1);
if (ret) {
wpa_printf(MSG_DEBUG,
"nl80211: Frequency set failed: %d (%s)",
ret, strerror(-ret));
} else {
wpa_printf(MSG_DEBUG,
"nl80211: Frequency set succeeded for ht2040 coex");
bss->bandwidth = params->freq->bandwidth;
}
} else if (!beacon_set) {
/*
* cfg80211 updates the driver on frequence change in AP
* mode only at the point when beaconing is started, so
* set the initial value here.
*/
bss->bandwidth = params->freq->bandwidth;
}
} }
return ret; return ret;
nla_put_failure: nla_put_failure:
@ -7364,8 +7394,8 @@ nla_put_failure:
} }
static int wpa_driver_nl80211_set_freq(struct i802_bss *bss, static int nl80211_set_channel(struct i802_bss *bss,
struct hostapd_freq_params *freq) struct hostapd_freq_params *freq, int set_chan)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
struct nl_msg *msg; struct nl_msg *msg;
@ -7379,7 +7409,8 @@ static int wpa_driver_nl80211_set_freq(struct i802_bss *bss,
if (!msg) if (!msg)
return -1; return -1;
nl80211_cmd(drv, msg, 0, NL80211_CMD_SET_WIPHY); nl80211_cmd(drv, msg, 0, set_chan ? NL80211_CMD_SET_CHANNEL :
NL80211_CMD_SET_WIPHY);
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
if (nl80211_put_freq_params(msg, freq) < 0) if (nl80211_put_freq_params(msg, freq) < 0)
@ -7399,6 +7430,13 @@ nla_put_failure:
} }
static int wpa_driver_nl80211_set_freq(struct i802_bss *bss,
struct hostapd_freq_params *freq)
{
return nl80211_set_channel(bss, freq, 0);
}
static u32 sta_flags_nl80211(int flags) static u32 sta_flags_nl80211(int flags)
{ {
u32 f = 0; u32 f = 0;