Date: Mon, 10 Aug 2015 06:12:25 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286564 - head/etc Message-ID: <201508100612.t7A6CP4t065138@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Mon Aug 10 06:12:24 2015 New Revision: 286564 URL: https://svnweb.freebsd.org/changeset/base/286564 Log: Commit more of the reversion of r286410 . Sorry. Modified: head/etc/network.subr Modified: head/etc/network.subr ============================================================================== --- head/etc/network.subr Mon Aug 10 06:11:10 2015 (r286563) +++ head/etc/network.subr Mon Aug 10 06:12:24 2015 (r286564) @@ -1249,70 +1249,6 @@ ifscript_down() fi } -# wlan_up -# Create IEEE802.3 interfaces. -# -wlan_up() -{ - local _list _iflist wlan parent ifn - _list= - _iflist=$* - - for wlan in `set | egrep ^wlans_[a-z]+[0-9]+=[a-z]+[0-9]+`; do - # Parse wlans_$parent=$ifn - wlan=`echo $wlan | sed -E 's/wlans_([a-z]+[0-9]+)=([a-z]+[0-9]+)/\1:\2/'` - OIFS=$IFS; IFS=:; set -- $wlan; parent=$1; ifn=$2; IFS=$OIFS - case $_iflist in - ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;; - *) continue ;; - esac - # Skip if ${ifn} already exists. - if ${IFCONFIG_CMD} $ifn > /dev/null 2>&1; then - continue - fi - ${IFCONFIG_CMD} ${ifn} create wlandev ${parent} - if [ $? -eq 0 ]; then - _list="$_list $ifn" - fi - done - if [ -n "${_list# }" ]; then - echo "Created wlan(4) interfaces: ${_list# }." - fi - debug "Created wlan(4)s: ${_list# }" -} - -# wlan_down -# Destroy IEEE802.3 interfaces. -# -wlan_down() -{ - local _list _iflist wlan parent ifn - _list= - _iflist=$* - - for wlan in `set | egrep ^wlans_[a-z]+[0-9]+=[a-z]+[0-9]+`; do - # Parse wlans_$parent=$ifn - wlan=`echo $wlan | sed -E 's/wlans_([a-z]+[0-9]+)=([a-z]+[0-9]+)/\1:\2/'` - OIFS=$IFS; IFS=:; set -- $wlan; parent=$1; ifn=$2; IFS=$OIFS - case $_iflist in - ""|$ifn|$ifn\ *|*\ $ifn\ *|*\ $ifn) ;; - *) continue ;; - esac - # Skip if ${ifn} doesn't exists. - if ! ${IFCONFIG_CMD} $ifn > /dev/null 2>&1; then - continue - fi - ${IFCONFIG_CMD} -n ${ifn} destroy - if [ $? -eq 0 ]; then - _list="$_list $ifn" - fi - done - if [ -n "${_list# }" ]; then - echo "Destroyed wlan(4) interfaces: ${_list# }." - fi - debug "Destroyed wlan(4)s: ${_list# }" -} - # clone_up # Create cloneable interfaces. # @@ -1462,9 +1398,6 @@ clone_down() # Create and configure child interfaces. Return 0 if child # interfaces are created. # -# XXXGL: the wlan code in this functions is superseded by wlan_up(), -# and will go away soon. -# childif_create() { local cfg child child_vlans child_wlans create_args debug_flags ifn i
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508100612.t7A6CP4t065138>