From 6651465b382acb71573b4989e07ff5a42d575239 Mon Sep 17 00:00:00 2001 From: avos Date: Mon, 29 Feb 2016 20:21:54 +0000 Subject: network.subr: avoid unnecessary reinitialization Do not start interface when wpa_supplicant or hostapd is used; they will restart it anyway Tested with: * Intel 3945BG, STA mode (wpa_supplicant) * RTL8188EU, HOSTAP mode (hostapd) Approved by: adrian (mentor) Differential Revision: https://reviews.freebsd.org/D5486 --- etc/network.subr | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index 0e5911b..2410e2d 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -214,16 +214,14 @@ ifconfig_up() ifalias $1 link alias ifalias $1 ether alias - if [ ${_cfg} -eq 0 ]; then - ${IFCONFIG_CMD} $1 up - fi - if wpaif $1; then /etc/rc.d/wpa_supplicant start $1 _cfg=0 # XXX: not sure this should count elif hostapif $1; then /etc/rc.d/hostapd start $1 _cfg=0 + elif [ ${_cfg} -eq 0 ]; then + ${IFCONFIG_CMD} $1 up fi if dhcpif $1; then -- cgit v1.1