From owner-svn-src-head@freebsd.org  Mon Aug 10 06:12:26 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0221B99E621;
 Mon, 10 Aug 2015 06:12:26 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CDA1FFCA;
 Mon, 10 Aug 2015 06:12:25 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7A6CPgx065139;
 Mon, 10 Aug 2015 06:12:25 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7A6CP4t065138;
 Mon, 10 Aug 2015 06:12:25 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201508100612.t7A6CP4t065138@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 10 Aug 2015 06:12:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286564 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Aug 2015 06:12:26 -0000

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