ccimx6: wifi: remove wpa_supplicant-based SoftAP logic on ccimx6
ccimx6 was the only platform using wpa_supplicant instead of hostapd for SoftAP configuration, requiring additional platform-specific logic. Since SoftAP works correctly with hostapd, drop the wpa_supplicant path and unify the AP implementation across platforms. https://onedigi.atlassian.net/browse/DEL-9923 Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
This commit is contained in:
parent
f95598eac7
commit
fbda81187c
|
|
@ -1,8 +0,0 @@
|
|||
|
||||
## Example bridge between eth0 and wlan0 (Atheros AR6233)
|
||||
#auto br0
|
||||
#iface br0 inet dhcp
|
||||
# bridge_ports eth0 wlan0
|
||||
# bridge_wpa_driver nl80211
|
||||
# bridge_wpa_conf /etc/wpa_supplicant.conf
|
||||
# pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d0301) ]
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
|
||||
## Example bridge between eth0 and wlan1 (Qualcomm QCA65x4)
|
||||
#auto br0
|
||||
#iface br0 inet dhcp
|
||||
# bridge_ports eth0 wlan1
|
||||
# pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d050A) ]
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
|
||||
# Wi-Fi AP interface (Atheros AR6233)
|
||||
#auto wlan1
|
||||
iface wlan1 inet dhcp
|
||||
udhcpc_opts -S -b >/dev/null &
|
||||
pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d0301) ]
|
||||
wpa-driver nl80211
|
||||
wpa-conf /etc/wpa_supplicant.conf
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
|
||||
# Wi-Fi AP interface (Atheros AR6233)
|
||||
#auto wlan1
|
||||
iface wlan1 inet static
|
||||
address ##WLAN1_STATIC_IP##
|
||||
netmask ##WLAN1_STATIC_NETMASK##
|
||||
gateway ##WLAN1_STATIC_GATEWAY##
|
||||
dns-nameservers ##WLAN1_STATIC_DNS##
|
||||
pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d0301) ]
|
||||
wpa-driver nl80211
|
||||
wpa-conf /etc/wpa_supplicant.conf
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
|
||||
# Wi-Fi AP interface (Qualcomm QCA65x4)
|
||||
#auto wlan1
|
||||
iface wlan1 inet dhcp
|
||||
udhcpc_opts -S -b >/dev/null &
|
||||
pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d050A) ]
|
||||
post-up ##WLAN1_POST_UP_ACTION##
|
||||
pre-down ##WLAN1_PRE_DOWN_ACTION##
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
|
||||
# Wi-Fi AP interface (Qualcomm QCA65x4)
|
||||
#auto wlan1
|
||||
iface wlan1 inet static
|
||||
address ##WLAN1_STATIC_IP##
|
||||
netmask ##WLAN1_STATIC_NETMASK##
|
||||
gateway ##WLAN1_STATIC_GATEWAY##
|
||||
dns-nameservers ##WLAN1_STATIC_DNS##
|
||||
pre-up [ $(find /sys/devices -name modalias -print0 | xargs -0 sort -u -z | grep sdio:c00v0271d050A) ]
|
||||
post-up ##WLAN1_POST_UP_ACTION##
|
||||
pre-down ##WLAN1_PRE_DOWN_ACTION##
|
||||
|
|
@ -22,12 +22,6 @@ SRC_URI:append = " \
|
|||
${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', '${WIFI_VIRTWLANS_FILES}', '', d)} \
|
||||
"
|
||||
|
||||
SRC_URI:append:ccimx6sbc = " \
|
||||
file://interfaces.wlan1.atheros.static \
|
||||
file://interfaces.wlan1.atheros.dhcp \
|
||||
file://interfaces.br0.atheros.example \
|
||||
"
|
||||
|
||||
SYSTEMD_SERVICE:${PN} = "ifupdown.service"
|
||||
|
||||
WPA_DRIVER ?= "nl80211"
|
||||
|
|
@ -71,11 +65,6 @@ do_install:append() {
|
|||
fi
|
||||
|
||||
cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces
|
||||
if [ "${MACHINE}" = "ccimx6sbc" ]; then
|
||||
# On ccimx6, append also the Atheros fragments so the user can
|
||||
# decide which one to use depending on the wireless MAC used on the SOM.
|
||||
cat ${WORKDIR}/interfaces.br0.atheros.example >> ${D}${sysconfdir}/network/interfaces
|
||||
fi
|
||||
}
|
||||
|
||||
install_virtwlans() {
|
||||
|
|
@ -97,9 +86,7 @@ WLAN1_PRE_DOWN_ACTION:ccimx9 = "systemctl stop hostapd@uap0.service"
|
|||
|
||||
install_wlan1() {
|
||||
cat ${WORKDIR}/interfaces.wlan1.${WLAN1_MODE} >> ${D}${sysconfdir}/network/interfaces
|
||||
if [ "${MACHINE}" = "ccimx6sbc" ]; then
|
||||
cat ${WORKDIR}/interfaces.wlan1.atheros.${WLAN1_MODE} >> ${D}${sysconfdir}/network/interfaces
|
||||
fi
|
||||
|
||||
[ -n "${WLAN1_AUTO}" ] && sed -i -e 's/^#auto wlan1/auto wlan1/g' ${D}${sysconfdir}/network/interfaces
|
||||
|
||||
# Remove config entries if corresponding variable is not defined
|
||||
|
|
|
|||
Loading…
Reference in New Issue