From nobody Sat Feb 18 12:12:19 2023 X-Original-To: dev-commits-src-branches@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 4PJncM4xgkz3s8WQ; Sat, 18 Feb 2023 12:12:19 +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 4PJncM42G6z3FY9; Sat, 18 Feb 2023 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722339; 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=29GwKRtJYw6rErraDX2nalRcCGuae5liZYUG9e9agRc=; b=gqlZS7rTnXWqASLK/HJy/eldTej/us5DS82zP1x+Fu2l4+8KUH3llf/jw91r0ohMoOCz2J nioIXBER+s/xufeWt42Y4PQV4kUwOBzlq39T7NNL2Zh9ONy8ZfCG7y70//9P16rctMsscH vjZdoQH7eIyZ2luooR/dGjIJCYUfOEySJ6aA+0MgOYzCxbCslWTUOq5mhpeIQ/N5fI4cQK b0tAw3Y0L7G/4eVr2Q+zEpZY4y5qBZgtNrYqhNGFq1goZ3F65/PHzFyywvJtKlCOr67iun d2I43ZArgMgg3V9FEVoXJtevyp3B3LtMJ2VwKKPIOxH+EGv/HQEQceqXfew2dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676722339; 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=29GwKRtJYw6rErraDX2nalRcCGuae5liZYUG9e9agRc=; b=YCl4pYFtfTxyqZp2dlACImpc8hlK+B/rR0Aq808pQ9TEdxCvJnEvCcKGVWpYe6KQIVXdvE eRLTfOz8LXAh275hnfjFUEmf2xKFFMuF5Y7KuL2NilXn9K+bDwgQGE6Sgv+J4/vwZzow4F IYhxX1PKnCeHCjCSTGrm8D/pW/9BvT1FAivTJaGrzsTZ7nlrnKgKh07aYpJD9bYbVSudzM UHsS9Z4kioknqRwlXzJqSPaCjpgct2cD6OFot2A8S6FDlHAN58Z5jDQxU4raOUIvvOpgMN Nc4yOA8LdOCNCXuSFIfpf2d66dGoPfloQvQU7eH4toMfsnPtBsqhziIdWFyjmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676722339; a=rsa-sha256; cv=none; b=D5Qmo3ocTqC4C4EXsSR5rLqKoFmxiQO7EUMjSLLJX1rfaxdaSJsN+Xk+nCwSPTB5Xlh8ey BpICnLofIXIHe0GrFP7qpdd1bmGBrb0gBU3HndLE3vOdoZMCJkTYiw0MinTO7R40OBaGag z7LLKyEna/sXc7AyHh91XyOJFvQZxomvRfIUoxjBkVFT02o2YpVopHRcheP/o+PGzvJdPc q6ozBj6LoWjJ83+asH9Wbf7Fz7YwRW+Wee6uMuNACeqcI9jaV82wTvGDzLNrdiEYpXPeNr +Rc0ZI3ma4taC1rSmPFdLwE7oT9sYNea3DGCaQ620xD0yKrJ6qzMrJaoKXbKkg== 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 4PJncM2BbTzMYh; Sat, 18 Feb 2023 12:12:19 +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 31ICCJom097718; Sat, 18 Feb 2023 12:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ICCJdk097717; Sat, 18 Feb 2023 12:12:19 GMT (envelope-from git) Date: Sat, 18 Feb 2023 12:12:19 GMT Message-Id: <202302181212.31ICCJdk097717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: c169fb625ee0 - stable/13 - netlink: use ifmedia to provide vlan interface operstate. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c169fb625ee0800ad1e6046440d67eef598581c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=c169fb625ee0800ad1e6046440d67eef598581c2 commit c169fb625ee0800ad1e6046440d67eef598581c2 Author: Alexander V. Chernikov AuthorDate: 2023-02-15 20:22:47 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-18 11:56:39 +0000 netlink: use ifmedia to provide vlan interface operstate. Netlink customers rely on admin and operational state when working with interfaces. The current implementation retuns "unknown" operstate for all interface types except IFT_ETHER and IFT_LOOP. This change updates the code to fetch vlan operstate in the same way as for the ether interfaces. For the rest of the interface types, operstate is now mapped to the admin state. Reported by: Marek Zarychta MFC after: 3 days (cherry picked from commit 5dd48f718433959c283a8a4d6e46512426f1e200) --- sys/netlink/route/iface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index f4936bb2c35b..9cd7e6e80f3c 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -174,9 +174,11 @@ get_operstate(struct ifnet *ifp, struct if_state *pstate) switch (ifp->if_type) { case IFT_ETHER: + case IFT_L2VLAN: get_operstate_ether(ifp, pstate); break; - case IFT_LOOP: + default: + /* Map admin state to the operstate */ if (ifp->if_flags & IFF_UP) { pstate->ifla_operstate = IF_OPER_UP; pstate->ifla_carrier = 1;