Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2023-09-14 19:17:42 +05:30 committed by GitHub
commit 6ba67f9c4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View file

@ -488,7 +488,7 @@ ${channel:+channel=$channel}
${channel_list:+chanlist=$channel_list} ${channel_list:+chanlist=$channel_list}
${hostapd_noscan:+noscan=1} ${hostapd_noscan:+noscan=1}
${tx_burst:+tx_queue_data2_burst=$tx_burst} ${tx_burst:+tx_queue_data2_burst=$tx_burst}
mbssid=$multiple_bssid ${multiple_bssid:+mbssid=$multiple_bssid}
#num_global_macaddr=$num_global_macaddr #num_global_macaddr=$num_global_macaddr
$base_cfg $base_cfg
@ -537,7 +537,7 @@ mac80211_generate_mac() {
local phy="$1" local phy="$1"
local id="${macidx:-0}" local id="${macidx:-0}"
wdev_tool "$phy" get_macaddr id=$id num_global=$num_global_macaddr mbssid=$multiple_bssid wdev_tool "$phy" get_macaddr id=$id num_global=$num_global_macaddr mbssid=${multiple_bssid:-0}
} }
get_board_phy_name() ( get_board_phy_name() (
@ -1049,7 +1049,7 @@ drv_mac80211_setup() {
txpower \ txpower \
rxantenna txantenna \ rxantenna txantenna \
frag rts beacon_int:100 htmode \ frag rts beacon_int:100 htmode \
num_global_macaddr:1 multiple_bssid:0 num_global_macaddr:1 multiple_bssid
json_get_values basic_rate_list basic_rate json_get_values basic_rate_list basic_rate
json_get_values scan_list scan_list json_get_values scan_list scan_list
json_select .. json_select ..

5
package/network/services/hostapd/src/src/ap/ucode.c
View file

@ -394,8 +394,10 @@ uc_hostapd_iface_stop(uc_vm_t *vm, size_t nargs)
struct hostapd_data *hapd = iface->bss[i]; struct hostapd_data *hapd = iface->bss[i];
hostapd_drv_stop_ap(hapd); hostapd_drv_stop_ap(hapd);
hapd->started = 0; hapd->beacon_set_done = 0;
} }
return NULL;
} }
static uc_value_t * static uc_value_t *
@ -471,7 +473,6 @@ out:
struct hostapd_data *hapd = iface->bss[i]; struct hostapd_data *hapd = iface->bss[i];
int ret; int ret;
hapd->started = 1;
hapd->conf->start_disabled = 0; hapd->conf->start_disabled = 0;
hostapd_set_freq(hapd, conf->hw_mode, iface->freq, hostapd_set_freq(hapd, conf->hw_mode, iface->freq,
conf->channel, conf->channel,