dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: adapt for single-instance wpad

Browse Source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
master
Daniel Golle 4 years ago
parent f37d634236
commit a66efbf916
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
package/kernel/mac80211/Makefile
Unescape Escape View File

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=mac80211 PKG_NAME:=mac80211
PKG_VERSION:=5.4.27-1 PKG_VERSION:=5.4.27-1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.4.27/ PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.4.27/
PKG_HASH:=4c853a2f4c4fcc81cf60a3d59c5efbdb60c3e4acda22996cb192443581753950 PKG_HASH:=4c853a2f4c4fcc81cf60a3d59c5efbdb60c3e4acda22996cb192443581753950

14
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
Unescape Escape View File

@ -594,11 +594,11 @@ mac80211_setup_supplicant() {
NEWSPLIST="${NEWSPLIST}$ifname " NEWSPLIST="${NEWSPLIST}$ifname "
if [ "${NEWAPLIST%% *}" != "${OLDAPLIST%% *}" ]; then if [ "${NEWAPLIST%% *}" != "${OLDAPLIST%% *}" ]; then
[ "$spobj" ] && ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}" [ "$spobj" ] && ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
add_sp=1 add_sp=1
fi fi
[ "$enable" = 0 ] && { [ "$enable" = 0 ] && {
ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}" ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
ip link set dev "$ifname" down ip link set dev "$ifname" down
return 0 return 0
} }
@ -623,7 +623,7 @@ mac80211_setup_supplicant_noctl() {
NEWSPLIST="${NEWSPLIST}$ifname " NEWSPLIST="${NEWSPLIST}$ifname "
[ "$enable" = 0 ] && { [ "$enable" = 0 ] && {
ubus call wpa_supplicant.${phy} config_del "{\"iface\":\"$ifname\"}" ubus call wpa_supplicant config_remove "{\"iface\":\"$ifname\"}"
ip link set dev "$ifname" down ip link set dev "$ifname" down
return 0 return 0
} }
@ -814,7 +814,7 @@ mac80211_vap_cleanup() {
local vaps="$2" local vaps="$2"
for wdev in $vaps; do for wdev in $vaps; do
[ "$service" != "none" ] && ubus call ${service}.${phy} config_remove "{\"iface\":\"$wdev\"}" [ "$service" != "none" ] && ubus call ${service} config_remove "{\"iface\":\"$wdev\"}"
ip link set dev "$wdev" down 2>/dev/null ip link set dev "$wdev" down 2>/dev/null
iw dev "$wdev" del iw dev "$wdev" del
done done
@ -962,9 +962,9 @@ drv_mac80211_setup() {
fi fi
if [ "$no_reload" != "0" ]; then if [ "$no_reload" != "0" ]; then
add_ap=1 add_ap=1
ubus wait_for hostapd.$phy ubus wait_for hostapd
ubus call hostapd.${phy} config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}" ubus call hostapd config_add "{\"iface\":\"$primary_ap\", \"config\":\"${hostapd_conf_file}\"}"
local hostapd_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['hostapd-${phy}'].pid") local hostapd_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['hostapd'].pid")
wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1 wireless_add_process "$hostapd_pid" "/usr/sbin/hostapd" 1
fi fi
ret="$?" ret="$?"

Write Preview
Loading…
Cancel
Save