From c92451ae9df570d2e66c1f4ea0d9bf1b5f4c6c12 Mon Sep 17 00:00:00 2001 From: Andriy Voskoboinyk Date: Sun, 19 Nov 2017 20:18:21 +0000 Subject: [PATCH] Reduce code duplication for wlan(4) interface creation in network.subr. Since wlandebug(8) can accept any (original or changed) interface name this part may be simplified a bit. --- etc/network.subr | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index daa7442088aa..af2b2147a05f 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1270,22 +1270,14 @@ wlan_up() fi if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then ${IFCONFIG_CMD} $child create ${create_args} && cfg=0 - if [ $? -eq 0 ]; then - _list="$_list $child" - fi - if [ -n "${debug_flags}" ]; then - wlandebug -i $child ${debug_flags} - fi else - i=`${IFCONFIG_CMD} wlan create ${create_args}` - # XXXGL: wlandebug should accept any name - if [ -n "${debug_flags}" ]; then - wlandebug -i $i ${debug_flags} - fi - ${IFCONFIG_CMD} $i name $child && cfg=0 - if [ $? -eq 0 ]; then - _list="$_list $child" - fi + ${IFCONFIG_CMD} wlan create ${create_args} name $child && cfg=0 + fi + if [ $? -eq 0 ]; then + _list="$_list $child" + fi + if [ -n "${debug_flags}" ]; then + wlandebug -i $child ${debug_flags} fi done done