---
src/ap/hw_features.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/ap/hw_features.h | 1 +
2 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index 133ed74..743d567 100644
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -27,6 +27,58 @@
#include "hw_features.h"
+int hostapd_select_random_channel(struct hostapd_iface *iface)
+{
+ int i, j, ret;
+
+ if (iface->conf->channel_list == NULL ||
+ iface->conf->channel_list[0] == -1)
+ return -1;
+
+ ret = -1;
+ if (iface->conf->channel == 0 && iface->conf->channel_list != NULL) {
+ int *chans, chans_num = 1, hw_chans_num;
+ u8 buf;
+
+ for (i = 0; iface->conf->channel_list[i] > 0; i++)
+ chans_num++;
+
+ chans = os_malloc(sizeof(int) * chans_num);
+ if (chans == NULL)
+ return -1;
+ os_memcpy(chans, iface->conf->channel_list,
+ sizeof(int) * chans_num);
+
+ hw_chans_num = iface->current_mode->num_channels;
+ buf = chans_num;
+ do {
+ struct hostapd_channel_data *hchan = NULL;
+
+ for (i = j = 0; i < chans_num; i++, j++) {
+ if (i == buf)
+ j++;
+ chans[i] = chans[j];
+ }
+
+ os_get_random(&buf, 1);
+ buf %= chans_num;
+
+ for (i = 0; i < hw_chans_num; i++) {
+ hchan = &iface->current_mode->channels[i];
+ if (hchan->chan == chans[buf] &&
+ !(hchan->flag & HOSTAPD_CHAN_DISABLED)) {
+ iface->conf->channel = hchan->chan;
+ ret = 0;
+ break;
+ }
+ }
+ chans_num--;
+ } while (iface->conf->channel == 0 && chans_num > 0);
+ os_free(chans);
+ }
+ return ret;
+}
+
void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
size_t num_hw_features)
{
@@ -642,6 +694,8 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
break;
}
}
+ if (iface->conf->channel == 0 && !hostapd_select_random_channel(iface))
+ ok = 1;
if (ok && iface->conf->secondary_channel) {
int sec_ok = 0;
int sec_chan = iface->conf->channel +
diff --git a/src/ap/hw_features.h b/src/ap/hw_features.h
index 88c2322..f800562 100644
--- a/src/ap/hw_features.h
+++ b/src/ap/hw_features.h
@@ -17,6 +17,7 @@
#define HW_FEATURES_H
#ifdef NEED_AP_MLME
+int hostapd_select_random_channel(struct hostapd_iface *iface);
void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
size_t num_hw_features);
int hostapd_get_hw_features(struct hostapd_iface *iface);
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
