mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-29 01:22:25 +00:00
hostapd: update to latest stable upstream release
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
From 83e8509388c5648dc8217b8f86d0461fade6a8d1 Mon Sep 17 00:00:00 2001
|
||||
From db1d10ff1663f3a08fd57bbc9d7b8e781055c1e1 Mon Sep 17 00:00:00 2001
|
||||
From: John Crispin <john@phrozen.org>
|
||||
Date: Tue, 4 Jan 2022 07:01:41 +0100
|
||||
Subject: [PATCH 4/4] hostapd: pending fixes
|
||||
Subject: [PATCH 4/8] hostapd: pending fixes
|
||||
|
||||
Signed-off-by: John Crispin <john@phrozen.org>
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 844a6bacb1c416ad5f56ee60142e786548dd659c Mon Sep 17 00:00:00 2001
|
||||
From ede24c139935619b506d21b43516592c484bcce8 Mon Sep 17 00:00:00 2001
|
||||
From: John Crispin <john@phrozen.org>
|
||||
Date: Tue, 9 Nov 2021 12:49:43 +0100
|
||||
Subject: [PATCH] hostapd: add wispr bandwidth patch
|
||||
Subject: [PATCH 5/8] hostapd: add wispr bandwidth patch
|
||||
|
||||
Signed-off-by: John Crispin <john@phrozen.org>
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From de25771a044c87fb9462066c4a162ea148612b89 Mon Sep 17 00:00:00 2001
|
||||
From bc32555de9efac9bd9b75c7b05166984cf1c45bc Mon Sep 17 00:00:00 2001
|
||||
From: John Crispin <john@phrozen.org>
|
||||
Date: Mon, 7 Feb 2022 09:56:20 +0100
|
||||
Subject: [PATCH 6/7] hostapd: add multiple_bssid rnr_beacon he_co_locate ema
|
||||
Subject: [PATCH 6/8] hostapd: add multiple_bssid rnr_beacon he_co_locate ema
|
||||
options
|
||||
|
||||
Signed-off-by: John Crispin <john@phrozen.org>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From d6510fa7b82b8e9fdd2266142aa7472ec407bcfb Mon Sep 17 00:00:00 2001
|
||||
From e3bfe63522e56abec6ed6baab135eae6b29ddaf4 Mon Sep 17 00:00:00 2001
|
||||
From: John Crispin <john@phrozen.org>
|
||||
Date: Mon, 7 Feb 2022 11:16:12 +0100
|
||||
Subject: [PATCH 7/7] hostapd: move radius into its own function
|
||||
Subject: [PATCH 7/8] hostapd: move radius into its own function
|
||||
|
||||
Signed-off-by: John Crispin <john@phrozen.org>
|
||||
---
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
From ec58340d35489da5851ccd75e921ecd700ace471 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Fietkau <nbd@nbd.name>
|
||||
Date: Mon, 7 Feb 2022 13:11:01 +0100
|
||||
Subject: [PATCH] hostapd: automatically calculate channel center freq on
|
||||
chan_switch
|
||||
|
||||
Simplifies switching to different channels when on >= VHT80
|
||||
|
||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
---
|
||||
.../services/hostapd/src/src/ap/ubus.c | 34 +++++++++++++++++++
|
||||
1 file changed, 34 insertions(+)
|
||||
|
||||
diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c
|
||||
index bcb80f4a33..5c9e966f70 100644
|
||||
--- a/package/network/services/hostapd/src/src/ap/ubus.c
|
||||
+++ b/package/network/services/hostapd/src/src/ap/ubus.c
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "utils/eloop.h"
|
||||
#include "utils/wpabuf.h"
|
||||
#include "common/ieee802_11_defs.h"
|
||||
+#include "common/hw_features_common.h"
|
||||
#include "hostapd.h"
|
||||
#include "neighbor_db.h"
|
||||
#include "wps_hostapd.h"
|
||||
@@ -22,6 +23,7 @@
|
||||
#include "wnm_ap.h"
|
||||
#include "taxonomy.h"
|
||||
#include "airtime_policy.h"
|
||||
+#include "hw_features.h"
|
||||
|
||||
static struct ubus_context *ctx;
|
||||
static struct blob_buf b;
|
||||
@@ -794,6 +796,7 @@ hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
|
||||
struct hostapd_data *hapd = get_hapd_from_object(obj);
|
||||
struct hostapd_config *iconf = hapd->iface->conf;
|
||||
struct hostapd_freq_params *freq_params;
|
||||
+ struct hostapd_hw_modes *mode = hapd->iface->current_mode;
|
||||
struct csa_settings css = {
|
||||
.freq_params = {
|
||||
.ht_enabled = iconf->ieee80211n,
|
||||
@@ -802,6 +805,8 @@ hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
|
||||
.sec_channel_offset = iconf->secondary_channel,
|
||||
}
|
||||
};
|
||||
+ u8 chwidth = hostapd_get_oper_chwidth(iconf);
|
||||
+ u8 seg0 = 0, seg1 = 0;
|
||||
int ret = UBUS_STATUS_OK;
|
||||
int i;
|
||||
|
||||
@@ -843,6 +848,35 @@ hostapd_switch_chan(struct ubus_context *ctx, struct ubus_object *obj,
|
||||
SET_CSA_SETTING(CSA_HE, freq_params.he_enabled, bool);
|
||||
SET_CSA_SETTING(CSA_BLOCK_TX, block_tx, bool);
|
||||
|
||||
+ css.freq_params.channel = hostapd_hw_get_channel(hapd, css.freq_params.freq);
|
||||
+ if (!css.freq_params.channel)
|
||||
+ return UBUS_STATUS_NOT_SUPPORTED;
|
||||
+
|
||||
+ switch (css.freq_params.bandwidth) {
|
||||
+ case 160:
|
||||
+ chwidth = CHANWIDTH_160MHZ;
|
||||
+ break;
|
||||
+ case 80:
|
||||
+ chwidth = css.freq_params.center_freq2 ? CHANWIDTH_80P80MHZ : CHANWIDTH_80MHZ;
|
||||
+ break;
|
||||
+ default:
|
||||
+ chwidth = CHANWIDTH_USE_HT;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ hostapd_set_freq_params(&css.freq_params, iconf->hw_mode,
|
||||
+ css.freq_params.freq,
|
||||
+ css.freq_params.channel, iconf->enable_edmg,
|
||||
+ iconf->edmg_channel,
|
||||
+ css.freq_params.ht_enabled,
|
||||
+ css.freq_params.vht_enabled,
|
||||
+ css.freq_params.he_enabled,
|
||||
+ css.freq_params.sec_channel_offset,
|
||||
+ chwidth, seg0, seg1,
|
||||
+ iconf->vht_capab,
|
||||
+ mode ? &mode->he_capab[IEEE80211_MODE_AP] :
|
||||
+ NULL);
|
||||
+
|
||||
for (i = 0; i < hapd->iface->num_bss; i++) {
|
||||
struct hostapd_data *bss = hapd->iface->bss[i];
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
From feffdf73c7a789ac65d91494b371a93babfba69a Mon Sep 17 00:00:00 2001
|
||||
From: John Crispin <john@phrozen.org>
|
||||
Date: Sat, 12 Feb 2022 16:43:15 +0100
|
||||
Subject: [PATCH] hostapd: add acs_exclude_dfs support
|
||||
|
||||
Signed-off-by: John Crispin <john@phrozen.org>
|
||||
---
|
||||
package/network/services/hostapd/files/hostapd.sh | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
|
||||
index c8e1eca88b..244e405b59 100644
|
||||
--- a/package/network/services/hostapd/files/hostapd.sh
|
||||
+++ b/package/network/services/hostapd/files/hostapd.sh
|
||||
@@ -119,6 +119,7 @@ hostapd_common_add_device_config() {
|
||||
config_add_int maxassoc
|
||||
|
||||
config_add_string acs_chan_bias
|
||||
+ config_add_boolean acs_exclude_dfs
|
||||
config_add_array hostapd_options
|
||||
|
||||
config_add_int airtime_mode
|
||||
@@ -137,7 +138,7 @@ hostapd_prepare_device_config() {
|
||||
json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
|
||||
acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
|
||||
rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc \
|
||||
- multiple_bssid he_co_locate rnr_beacon ema
|
||||
+ multiple_bssid he_co_locate rnr_beacon ema acs_exclude_dfs
|
||||
|
||||
hostapd_set_log_options base_cfg
|
||||
|
||||
@@ -151,6 +152,7 @@ hostapd_prepare_device_config() {
|
||||
set_default rnr_beacon 0
|
||||
set_default multiple_bssid 0
|
||||
set_default ema 0
|
||||
+ set_default acs_exclude_dfs 0
|
||||
|
||||
[ -n "$country" ] && {
|
||||
append base_cfg "country_code=$country" "$N"
|
||||
@@ -247,6 +249,7 @@ hostapd_prepare_device_config() {
|
||||
[ "$he_co_locate" -gt 0 ] && append base_cfg "he_co_locate=$he_co_locate" "$N"
|
||||
[ "$multiple_bssid" -gt 0 ] && append base_cfg "multiple_bssid=$multiple_bssid" "$N"
|
||||
[ "$ema" -gt 0 ] && append base_cfg "ema=$ema" "$N"
|
||||
+ [ "$acs_exclude_dfs" -gt 0 ] && append base_cfg "acs_exclude_dfs=$acs_exclude_dfs" "$N"
|
||||
|
||||
json_get_values opts hostapd_options
|
||||
for val in $opts; do
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user