From nobody Mon Feb 20 20:13:08 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 4PLDBF1tkpz3s6jb; Mon, 20 Feb 2023 20:13:09 +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 4PLDBD6Vy4z3KvK; Mon, 20 Feb 2023 20:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923988; 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=FVIKiuyX6gcV1AdDNPXjuRWrnZ1LCjdHpB4dO/xVCYc=; b=fxBGWKdqTpggUqERBAZdtnAA3nc+8UfbFWyKv3nZpDLYGMm0Xex9TTQTWNOkeqNG+smI2Z UmajjmJ1ztfGCBI3hG5zSE1rJnb0rEZggQ/up4OQhFVdUp1z3unXpIy9gqqQDn+sNx8A/c AGnfv/aYsf0t2N2BUM7ZXwzPS7p0vY5O6W1ddnapQvw2EzRTjT01z+JI62enGflZw6eG3N qptaCTdG2+hbcuX6yNfg8iwbMxJb4HJ/PXP/kwJTtb9c9d4/0HvCHcek772zFD/bq2HFhX TmeLJUR5Iy+UPs2kML9VLEI9CSBCzIUJALwTjyaQHdZOAs1Lq2Tt6JuC9psreg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923988; 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=FVIKiuyX6gcV1AdDNPXjuRWrnZ1LCjdHpB4dO/xVCYc=; b=bob1bZYQYffP7iH8wx21wP2jWkucnSN7+gJfNiarMEKVrJfk9XUBhy4X1vOszxfv1yRSX5 wSUmOim7UrGAqCrvOxbpLeH4rE7OvujKTbXwuZzOzlIdp7VYgXVXoehW/kp/OyTROUHt5+ 0Az9gDPL8PShuKBBQT+ts2n6f5RGkif9GJqDHXv9TzLK6WksF3DykDuQ2zJyeZOQWKCrIn 0wT/wqHWAvXTs7guAO4JvSl4h1MfRY5cClfZX2CUk9fbl4ROglHhMyvdf5w5JbedZd8tyl kkFa0vR+H2uVySsMQRmgIBmQ2ppdJODHjop+DOFWdvQ3p+0r5JqiBu0UBKUqqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676923988; a=rsa-sha256; cv=none; b=rGs9ezmDd4UDIeQJrIN2Vk2Za3fMLEzz+G1IEiTcfFK4O7dJ+qwQZ/2F6jTm0d3CIm1C94 poxvg3Y8iFMK2/CIMjPOj8gpl6TdtcYVmqKThbwfXE51/Eb98jikjWZXJ+PK/CzC8Sr/5g AA8Jog3XPlnwlJu33yjI+/QIeQ7ZIiNVF/3TvCoyZdvZPyVXr2iomyO4bY74ToYtLHUwiX s0bG9hUok74kyq9xwKFLAp/Nr0AB+vDEmzimUy2G0G1HxIMPYEEU4MaAigu+LHkq1GM18N KmLFsU3ENxKeN9dqGdvQDngTg9BYWbKCQQ/5i43qLI8VS4k+RNOUEZVXOMy+Xw== 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 4PLDBD5cQbzv50; Mon, 20 Feb 2023 20:13:08 +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 31KKD8RO094115; Mon, 20 Feb 2023 20:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KKD8ew094114; Mon, 20 Feb 2023 20:13:08 GMT (envelope-from git) Date: Mon, 20 Feb 2023 20:13:08 GMT Message-Id: <202302202013.31KKD8ew094114@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: 94eb891ce9f5 - releng/13.2 - 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 94eb891ce9f58b650a6a0219a2c7d55ed7fb358b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=94eb891ce9f58b650a6a0219a2c7d55ed7fb358b commit 94eb891ce9f58b650a6a0219a2c7d55ed7fb358b Author: Alexander V. Chernikov AuthorDate: 2023-02-15 20:22:47 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-20 19:48:26 +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 Approved by: re(cperciva) MFC after: 3 days (cherry picked from commit 5dd48f718433959c283a8a4d6e46512426f1e200) (cherry picked from commit c169fb625ee0800ad1e6046440d67eef598581c2) --- 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;