From nobody Wed May 24 15:35:01 2023 X-Original-To: dev-commits-src-all@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 4QRFcP6mwbz4CqpF; Wed, 24 May 2023 15:35:01 +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 4QRFcP66bwz3yBX; Wed, 24 May 2023 15:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684942501; 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=t8G+/XvRZBVq5DeckpPBHOJERHvZT8B53+a1DjZw4NQ=; b=Rz9D4qjNQPCBXs/yL/11tR02bdHqpQ/+eQF9qupvkJklvpBcRe8tcnctclB+UHmjnpwTcB RSMApGyTz/xO598AXEASEGqFknNNm2JcCeJKguoS3fuSFVfxrP6RWSTnZAcYGgji/lI+eZ jd1EqBiChLXmwdOh+gT8eDSK6YY0igdwfiF8D8CYoFov+j64+MXht+amGipjzgXrH+G7is DoTTu3nehwu2ExkCvYuEj2mZ3tCJPU2jD/7NLUqAtqPmbmnApx2OjXfRAQ4hCPs9RpAeCn XlwbH/rKL0YVDhB+xgBsP61QSbfQJrzDFNIlwcNT+TYUAlEK0UwYs/Pnch6xvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684942501; 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=t8G+/XvRZBVq5DeckpPBHOJERHvZT8B53+a1DjZw4NQ=; b=gdZTZ0OckAiGSAwbdbIBL2Wz1XIBWOaI4xyBye+sQkY+kvB7yrbJboljLAonVoiRZqrcXY o2krnTmTKD6v8nALG4WW4ZU/uwRtc1lcACRG6VWu/qt2OZs6nS/kmxpBf/gjDvB0dDbkV6 Fo0Tpfjvj8GmDdRYI82dq0POMaWLq6s4HEwqG5MyG5L1uU3Wr6tmn/2f8I18mcsmIdU1Nd p6RJIoLwdeNF8LwJWg6nrypdbGr2uamEYwKkE3rEPQfHnahQaKBqLz7my2HTwmPHB1F4u6 R/2MKypoUMGWG+IoM/z4XkFbF3n/mVXzJTv1n0QF7ixPJMx7B3UHdg1Vym6K8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684942501; a=rsa-sha256; cv=none; b=Svk2DaIY9en2sfL+fxriFlmpOVng4AiKxrLJDa8SQVHmE94udpR8Um2BUFmm9VH7aVKS5I 9RJ0mQz1UoLavB+CnbjPE4r2Yk/6sRw2J4tO2nyozOpUKvscIbNz2wwU2iUT7U4/Wk6mGk 3Wz3LOPXFrA67afYXX9GebpOegeciIJUCcKLGGLHF2fer5Llpsn9TsNl0mOhsEsO5Qa9Ar 4LzTNE/RZkSysnyKR6sZuTSdVBFhOR3pBXFEkWB1haeItF1j+KxmMW9Q+zJeUBRfnTS/0V p6oqoUwgaQj+YxcOW2kGGngW+8FcKnStGotTyO0QJ4BFDJBR7BHWxEZZDiHKPw== 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 4QRFcP5BLVznX0; Wed, 24 May 2023 15:35:01 +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 34OFZ1VJ003637; Wed, 24 May 2023 15:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OFZ1DR003635; Wed, 24 May 2023 15:35:01 GMT (envelope-from git) Date: Wed, 24 May 2023 15:35:01 GMT Message-Id: <202305241535.34OFZ1DR003635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 12cfa3c1bd56 - main - ifconfig: fix interface address ordering with Netlink. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 12cfa3c1bd5629a35df3a9b7b023c1a802ae771c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=12cfa3c1bd5629a35df3a9b7b023c1a802ae771c commit 12cfa3c1bd5629a35df3a9b7b023c1a802ae771c Author: Alexander V. Chernikov AuthorDate: 2023-05-24 15:34:21 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-24 15:34:21 +0000 ifconfig: fix interface address ordering with Netlink. --- sbin/ifconfig/ifconfig_netlink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 1df90c2963e3..140808e18681 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -124,7 +124,6 @@ nl_init_socket(struct snl_state *ss) struct ifa { struct ifa *next; - uint32_t count; uint32_t idx; struct snl_parsed_addr addr; }; @@ -214,7 +213,7 @@ prepare_ifaddrs(struct snl_state *ss, struct ifmap *ifmap) continue; struct iface *iface = ifmap->ifaces[ifindex]; ifa->next = iface->ifa; - ifa->count = ++count; + ifa->idx = ++count; iface->ifa = ifa; iface->ifa_count++; }