From owner-svn-src-all@freebsd.org Wed Oct 24 20:49:52 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB8C3106FB0A; Wed, 24 Oct 2018 20:49:52 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A60279A1D; Wed, 24 Oct 2018 20:49:52 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 661902F70E; Wed, 24 Oct 2018 20:49:52 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9OKnqQH097926; Wed, 24 Oct 2018 20:49:52 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9OKnqil097925; Wed, 24 Oct 2018 20:49:52 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201810242049.w9OKnqil097925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 24 Oct 2018 20:49:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339695 - head/libexec/rc X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/libexec/rc X-SVN-Commit-Revision: 339695 X-SVN-Commit-Repository: base 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.29 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: Wed, 24 Oct 2018 20:49:53 -0000 Author: glebius Date: Wed Oct 24 20:49:51 2018 New Revision: 339695 URL: https://svnweb.freebsd.org/changeset/base/339695 Log: Remove code that is dead since r287197. Today wlan(4) interfaces aren't children of some other interface. Creation happens only in wlan_up(). Modified: head/libexec/rc/network.subr Modified: head/libexec/rc/network.subr ============================================================================== --- head/libexec/rc/network.subr Wed Oct 24 19:40:09 2018 (r339694) +++ head/libexec/rc/network.subr Wed Oct 24 20:49:51 2018 (r339695) @@ -1469,39 +1469,12 @@ 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 + local cfg child child_vlans create_args debug_flags ifn i cfg=1 ifn=$1 - # Create wireless interfaces - child_wlans=`get_if_var $ifn wlans_IF` - - for child in ${child_wlans}; do - create_args="wlandev $ifn `get_if_var $child create_args_IF`" - debug_flags="`get_if_var $child wlandebug_IF`" - - if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then - ${IFCONFIG_CMD} $child create ${create_args} && cfg=0 - if [ -n "${debug_flags}" ]; then - wlandebug -i $child ${debug_flags} - fi - else - i=`${IFCONFIG_CMD} wlan create ${create_args}` - if [ -n "${debug_flags}" ]; then - wlandebug -i $i ${debug_flags} - fi - ${IFCONFIG_CMD} $i name $child && cfg=0 - fi - if autoif $child; then - ifn_start $child - fi - done - # Create vlan interfaces child_vlans=`get_if_var $ifn vlans_IF` @@ -1536,16 +1509,8 @@ childif_create() # childif_destroy() { - local cfg child child_vlans child_wlans ifn + local cfg child child_vlans ifn cfg=1 - - child_wlans=`get_if_var $ifn wlans_IF` - for child in ${child_wlans}; do - if ! ifexists $child; then - continue - fi - ${IFCONFIG_CMD} -n $child destroy && cfg=0 - done child_vlans=`get_if_var $ifn vlans_IF` for child in ${child_vlans}; do