From owner-svn-src-all@freebsd.org Mon Aug 10 06:11:11 2015 Return-Path: Delivered-To: svn-src-all@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 C064799E5EB; Mon, 10 Aug 2015 06:11:11 +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 AF9D7CFF; Mon, 10 Aug 2015 06:11:11 +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 t7A6BBr7063873; Mon, 10 Aug 2015 06:11:11 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7A6BBb9063872; Mon, 10 Aug 2015 06:11:11 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201508100611.t7A6BBb9063872@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Mon, 10 Aug 2015 06:11:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286563 - head/etc/rc.d X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2015 06:11:11 -0000 Author: adrian Date: Mon Aug 10 06:11:10 2015 New Revision: 286563 URL: https://svnweb.freebsd.org/changeset/base/286563 Log: Finish reverting r286410 - sorry, I somehow missed this with svn commit. Modified: head/etc/rc.d/netif Modified: head/etc/rc.d/netif ============================================================================== --- head/etc/rc.d/netif Mon Aug 10 00:53:45 2015 (r286562) +++ head/etc/rc.d/netif Mon Aug 10 06:11:10 2015 (r286563) @@ -37,8 +37,6 @@ name="netif" rcvar="${name}_enable" start_cmd="netif_start" stop_cmd="netif_stop" -wlanup_cmd="wlan_up" -wlandown_cmd="wlan_down" cloneup_cmd="clone_up" clonedown_cmd="clone_down" clear_cmd="doclear" @@ -67,9 +65,6 @@ netif_start() trap : 2 fi - # Create IEEE802.3 interface - wlan_up $cmdifn - # Create cloned interfaces clone_up $cmdifn @@ -96,14 +91,12 @@ netif_start() netif_stop() { _clone_down=1 - _wlan_down=1 netif_stop0 $* } doclear() { _clone_down= - _wlan_down= netif_stop0 $* } @@ -118,11 +111,6 @@ netif_stop0() # Deconfigure the interface(s) netif_common ifn_stop $cmdifn - # Destroy wlan interfaces - if [ -n "$_wlan_down" ]; then - wlan_down $cmdifn - fi - # Destroy cloned interfaces if [ -n "$_clone_down" ]; then clone_down $cmdifn