From owner-svn-src-all@freebsd.org  Sun Nov 19 20:18:23 2017
Return-Path: <owner-svn-src-all@freebsd.org>
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 35ACCDBDA8B;
 Sun, 19 Nov 2017 20:18:23 +0000 (UTC)
 (envelope-from avos@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 mx1.freebsd.org (Postfix) with ESMTPS id 0275539B7;
 Sun, 19 Nov 2017 20:18:22 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAJKIMu3037947;
 Sun, 19 Nov 2017 20:18:22 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAJKIM73037946;
 Sun, 19 Nov 2017 20:18:22 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201711192018.vAJKIM73037946@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Sun, 19 Nov 2017 20:18:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326001 - head/etc
X-SVN-Group: head
X-SVN-Commit-Author: avos
X-SVN-Commit-Paths: head/etc
X-SVN-Commit-Revision: 326001
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.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Nov 2017 20:18:23 -0000

Author: avos
Date: Sun Nov 19 20:18:21 2017
New Revision: 326001
URL: https://svnweb.freebsd.org/changeset/base/326001

Log:
  Reduce code duplication for wlan(4) interface creation in network.subr.
  
  Since wlandebug(8) can accept any (original or changed) interface name
  this part may be simplified a bit.

Modified:
  head/etc/network.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Sun Nov 19 20:13:11 2017	(r326000)
+++ head/etc/network.subr	Sun Nov 19 20:18:21 2017	(r326001)
@@ -1270,22 +1270,14 @@ wlan_up()
 			fi
 			if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
 				${IFCONFIG_CMD} $child create ${create_args} && cfg=0
-				if [ $? -eq 0 ]; then
-					_list="$_list $child"
-				fi
-				if [ -n "${debug_flags}" ]; then
-					wlandebug -i $child ${debug_flags}
-				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
+				${IFCONFIG_CMD} wlan create ${create_args} name $child && cfg=0
+			fi
+			if [ $? -eq 0 ]; then
+				_list="$_list $child"
+			fi
+			if [ -n "${debug_flags}" ]; then
+				wlandebug -i $child ${debug_flags}
 			fi
 		done
 	done