From nobody Fri Jul 08 17:45:31 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 93ABF12AEFAA; Fri, 8 Jul 2022 17:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lfgfg3ftCz47VZ; Fri, 8 Jul 2022 17:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysxhHYXWJRAFAq7kdnK5sNPoQ0ltKFCPQb3pZL00L5E=; b=LQ2bzEwIeujFB3CWzdfZdY2cRsTXo+bT8mEoXHleGOpRwUL6s7dZewma8Grzq39bLypuwH Su6Nxi+SGsZgLDLpP+QrvGLhXOLGMMA3mA5b5nMZuCj6D73KHzIv8+pEhRL+KWLx7j0Qz4 Rtqd7iHv8ZQO0KOZpTAin2UFoXHXJlDqzkUc65j46Sb976DkC1YQUuhiBkrKPLgsF1fnWa ElHFYYiq2eVMif22qkt1emMmDY2frzMPDxyvV8lPKVKDUNEQ9b7u9uaC/yeQbEm7oDoIct Up6A7aSaz0TCrRXXWTPgxlBQR8FRAI6RczUkwWpchrTC+4MuhVZ7KPUAVbr+qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lfgfg2cvQzFXf; Fri, 8 Jul 2022 17:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268HjVYX063931; Fri, 8 Jul 2022 17:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268HjVK5063930; Fri, 8 Jul 2022 17:45:31 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:45:31 GMT Message-Id: <202207081745.268HjVK5063930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f7f4ce2d2810 - main - wtap(4): Rename interface name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7f4ce2d28105742f92df354d57b868e1ef3f929 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ysxhHYXWJRAFAq7kdnK5sNPoQ0ltKFCPQb3pZL00L5E=; b=Qps6jQwT2UKSKPCqEzPlkMHmXYqd3Y4kR5qu16Lbo7Sl3MyeLDMGB9oOhcq8scaj6KMLIz ZJCqkBsUtBaZOujYBnVhzkbt54MTMd2d16jOQkKxVTZp0kLaBZz7zmKNW/1+JfDDibeomO BLmVemsqkeGJzKXyUwuXJROXhyghTwhQHNWmkbphPr564WJQvlTFp8ekkOPSIKiaISDn+K GZvxJILqZspQTFmePqk8Qu0vs0t/d9SeUUt1frJd34ZfjPAzoCH6/7DSpuzui+yu749t7s yQYOkpc0S97w2PiSHkAQN4KShLSzsUtyqRoOaUouHOQnS2Bp8tereTX7kM5A+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302331; a=rsa-sha256; cv=none; b=OSoP4ogKyrgu05zXuICP6sgCPRsIxa7uCJHtkZpJt6KVfHaxuRKML6uFii7O7+P/Q7dkUf vioTchVQKHwWQDqAP5Xn3f8RLW+17hDE0SEjtyS4clN1xO9+CGnHbp8SgaAW+HtdbhUOSZ vWQNvhgiwsE1a16EzOKfWjo2XmkAu6OkF7CLKhMy2q8+gyi4cxbTb5nc0vL7MSCGRBtUQB wNypbL7tzX+n6rsUL/KbDq36N5gU63ooDd7/mLghxUfhL1ZneWnUbsmiuaYyHchIhBtYcF OegEzYrF+I+8o+nS2pKdjSKlv6nDeI+iD1TWXewBLjFLJB8U47GRjqhPu0KzAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f7f4ce2d28105742f92df354d57b868e1ef3f929 commit f7f4ce2d28105742f92df354d57b868e1ef3f929 Author: En-Wei Wu AuthorDate: 2022-07-08 17:29:15 +0000 Commit: Li-Wen Hsu CommitDate: 2022-07-08 17:29:15 +0000 wtap(4): Rename interface name The original interface created by wtap is named "wlan%d", which is the same as the name of the vap created by wlan(4) and cause ifconfig(8) may output like this: wlan0: parent interface: wlan0 Rename the interface created by wtap(4) to "wtap%d" to avoid confusing. Reviewed by: adrian Sponsored by: Google, Inc. (GSoC 2022) Differential Revision: https://reviews.freebsd.org/D35751 --- sys/dev/wtap/wtap_hal/hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c index 98b1714d50b5..5bdcc40c9ccb 100644 --- a/sys/dev/wtap/wtap_hal/hal.c +++ b/sys/dev/wtap/wtap_hal/hal.c @@ -183,7 +183,7 @@ new_wtap(struct wtap_hal *hal, int32_t id) hal->hal_devs[id]->sc_md = hal->hal_md; hal->hal_devs[id]->id = id; snprintf(hal->hal_devs[id]->name, sizeof(hal->hal_devs[id]->name), - "wlan%d", id); + "wtap%d", id); mtx_init(&hal->hal_devs[id]->sc_mtx, "wtap_softc mtx", NULL, MTX_DEF | MTX_RECURSE);