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

wpa_supplicant: Use the 'no_ir' notation

Browse source 
Use the 'no_ir' notation instead of the 'passive scan' and
'no_ibss' notations to match the earlier change in nl80211.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2014-07-07 14:20:54 +03:00 committed by Jouni Malinen
parent 85b60adddd
commit 0a44358055
5 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ap/hw_features.c
View file

@ -107,7 +107,8 @@ int hostapd_get_hw_features(struct hostapd_iface *iface)
/* /*
* Disable all channels that are marked not to allow * Disable all channels that are marked not to allow
* IBSS operation or active scanning. * to initiate radiation (a.k.a. passive scan and no
* IBSS).
* Use radar channels only if the driver supports DFS. * Use radar channels only if the driver supports DFS.
*/ */
if ((feature->channels[j].flag & if ((feature->channels[j].flag &
@ -118,8 +119,7 @@ int hostapd_get_hw_features(struct hostapd_iface *iface)
!(iface->drv_flags & !(iface->drv_flags &
WPA_DRIVER_FLAGS_DFS_OFFLOAD)) || WPA_DRIVER_FLAGS_DFS_OFFLOAD)) ||
(feature->channels[j].flag & (feature->channels[j].flag &
(HOSTAPD_CHAN_NO_IBSS | HOSTAPD_CHAN_NO_IR)) {
HOSTAPD_CHAN_PASSIVE_SCAN))) {
feature->channels[j].flag |= feature->channels[j].flag |=
HOSTAPD_CHAN_DISABLED; HOSTAPD_CHAN_DISABLED;
} }
@ -958,12 +958,10 @@ static int hostapd_is_usable_chan(struct hostapd_iface *iface,
return 1; return 1;
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"%schannel [%i] (%i) is disabled for use in AP mode, flags: 0x%x%s%s%s", "%schannel [%i] (%i) is disabled for use in AP mode, flags: 0x%x%s%s",
primary ? "" : "Configured HT40 secondary ", primary ? "" : "Configured HT40 secondary ",
i, chan->chan, chan->flag, i, chan->chan, chan->flag,
chan->flag & HOSTAPD_CHAN_NO_IBSS ? " NO-IBSS" : "", chan->flag & HOSTAPD_CHAN_NO_IR ? " NO-IR" : "",
chan->flag & HOSTAPD_CHAN_PASSIVE_SCAN ?
" PASSIVE-SCAN" : "",
chan->flag & HOSTAPD_CHAN_RADAR ? " RADAR" : ""); chan->flag & HOSTAPD_CHAN_RADAR ? " RADAR" : "");
} }

3
src/drivers/driver.h
View file

@ -23,8 +23,7 @@
#include "utils/list.h" #include "utils/list.h"
#define HOSTAPD_CHAN_DISABLED 0x00000001 #define HOSTAPD_CHAN_DISABLED 0x00000001
#define HOSTAPD_CHAN_PASSIVE_SCAN 0x00000002 #define HOSTAPD_CHAN_NO_IR 0x00000002
#define HOSTAPD_CHAN_NO_IBSS 0x00000004
#define HOSTAPD_CHAN_RADAR 0x00000008 #define HOSTAPD_CHAN_RADAR 0x00000008
#define HOSTAPD_CHAN_HT40PLUS 0x00000010 #define HOSTAPD_CHAN_HT40PLUS 0x00000010
#define HOSTAPD_CHAN_HT40MINUS 0x00000020 #define HOSTAPD_CHAN_HT40MINUS 0x00000020

2
src/drivers/driver_nl80211.c
View file

@ -6672,7 +6672,7 @@ static void phy_info_freq(struct hostapd_hw_modes *mode,
if (tb_freq[NL80211_FREQUENCY_ATTR_DISABLED]) if (tb_freq[NL80211_FREQUENCY_ATTR_DISABLED])
chan->flag |= HOSTAPD_CHAN_DISABLED; chan->flag |= HOSTAPD_CHAN_DISABLED;
if (tb_freq[NL80211_FREQUENCY_ATTR_NO_IR]) if (tb_freq[NL80211_FREQUENCY_ATTR_NO_IR])
chan->flag |= HOSTAPD_CHAN_PASSIVE_SCAN | HOSTAPD_CHAN_NO_IBSS; chan->flag |= HOSTAPD_CHAN_NO_IR;
if (tb_freq[NL80211_FREQUENCY_ATTR_RADAR]) if (tb_freq[NL80211_FREQUENCY_ATTR_RADAR])
chan->flag |= HOSTAPD_CHAN_RADAR; chan->flag |= HOSTAPD_CHAN_RADAR;

4
wpa_supplicant/ctrl_iface.c
View file

@ -3387,8 +3387,8 @@ static int ctrl_iface_get_capability_freq(struct wpa_supplicant *wpa_s,
continue; continue;
ret = os_snprintf(pos, end - pos, " %d = %d MHz%s%s\n", ret = os_snprintf(pos, end - pos, " %d = %d MHz%s%s\n",
chnl[i].chan, chnl[i].freq, chnl[i].chan, chnl[i].freq,
chnl[i].flag & HOSTAPD_CHAN_NO_IBSS ? chnl[i].flag & HOSTAPD_CHAN_NO_IR ?
" (NO_IBSS)" : "", " (NO_IR)" : "",
chnl[i].flag & HOSTAPD_CHAN_RADAR ? chnl[i].flag & HOSTAPD_CHAN_RADAR ?
" (DFS)" : ""); " (DFS)" : "");

18
wpa_supplicant/p2p_supplicant.c
View file

@ -3513,7 +3513,7 @@ static struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
enum chan_allowed { enum chan_allowed {
NOT_ALLOWED, PASSIVE_ONLY, ALLOWED NOT_ALLOWED, NO_IR, ALLOWED
}; };
static int has_channel(struct wpa_global *global, static int has_channel(struct wpa_global *global,
@ -3535,10 +3535,8 @@ static int has_channel(struct wpa_global *global,
(HOSTAPD_CHAN_DISABLED | (HOSTAPD_CHAN_DISABLED |
HOSTAPD_CHAN_RADAR)) HOSTAPD_CHAN_RADAR))
return NOT_ALLOWED; return NOT_ALLOWED;
if (mode->channels[i].flag & if (mode->channels[i].flag & HOSTAPD_CHAN_NO_IR)
(HOSTAPD_CHAN_PASSIVE_SCAN | return NO_IR;
HOSTAPD_CHAN_NO_IBSS))
return PASSIVE_ONLY;
return ALLOWED; return ALLOWED;
} }
} }
@ -3627,8 +3625,8 @@ static enum chan_allowed wpas_p2p_verify_80mhz(struct wpa_supplicant *wpa_s,
res = has_channel(wpa_s->global, mode, adj_chan, &flags); res = has_channel(wpa_s->global, mode, adj_chan, &flags);
if (res == NOT_ALLOWED) if (res == NOT_ALLOWED)
return NOT_ALLOWED; return NOT_ALLOWED;
if (res == PASSIVE_ONLY) if (res == NO_IR)
ret = PASSIVE_ONLY; ret = NO_IR;
if (i == 0 && !(flags & HOSTAPD_CHAN_VHT_10_70)) if (i == 0 && !(flags & HOSTAPD_CHAN_VHT_10_70))
return NOT_ALLOWED; return NOT_ALLOWED;
@ -3666,8 +3664,8 @@ static enum chan_allowed wpas_p2p_verify_channel(struct wpa_supplicant *wpa_s,
if (res == NOT_ALLOWED || res2 == NOT_ALLOWED) if (res == NOT_ALLOWED || res2 == NOT_ALLOWED)
return NOT_ALLOWED; return NOT_ALLOWED;
if (res == PASSIVE_ONLY || res2 == PASSIVE_ONLY) if (res == NO_IR || res2 == NO_IR)
return PASSIVE_ONLY; return NO_IR;
return res; return res;
} }
@ -3711,7 +3709,7 @@ static int wpas_p2p_setup_channels(struct wpa_supplicant *wpa_s,
} }
reg->channel[reg->channels] = ch; reg->channel[reg->channels] = ch;
reg->channels++; reg->channels++;
} else if (res == PASSIVE_ONLY && } else if (res == NO_IR &&
wpa_s->conf->p2p_add_cli_chan) { wpa_s->conf->p2p_add_cli_chan) {
if (cli_reg == NULL) { if (cli_reg == NULL) {
wpa_printf(MSG_DEBUG, "P2P: Add operating class %u (client only)", wpa_printf(MSG_DEBUG, "P2P: Add operating class %u (client only)",