d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce code duplication for wlan(4) interface creation in network.subr.

Browse Source 
Since wlandebug(8) can accept any (original or changed) interface name
this part may be simplified a bit.
This commit is contained in:
Andriy Voskoboinyk 2017-11-19 20:18:21 +00:00
parent e989c74331
commit c92451ae9d
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/network.subr
View File

@ -1270,23 +1270,15 @@ wlan_up()
fi fi
if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
${IFCONFIG_CMD} $child create ${create_args} && cfg=0 ${IFCONFIG_CMD} $child create ${create_args} && cfg=0
else
${IFCONFIG_CMD} wlan create ${create_args} name $child && cfg=0
fi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
_list="$_list $child" _list="$_list $child"
fi fi
if [ -n "${debug_flags}" ]; then if [ -n "${debug_flags}" ]; then
wlandebug -i $child ${debug_flags} wlandebug -i $child ${debug_flags}
fi 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
fi
done done
done done
if [ -n "${_list# }" ]; then if [ -n "${_list# }" ]; then