From nobody Tue Apr 25 12:29:08 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 4Q5LsJ45Vcz4786R; Tue, 25 Apr 2023 12:29:08 +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 4Q5LsJ3Yy9z4JjZ; Tue, 25 Apr 2023 12:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682425748; 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=/kDRA+BZA8EDt+A/Uzi7DTww5gR3xuzJT3ehUT55kO0=; b=I7fiNa/ha3HLxuJoJYJrA5HD2BkBIg9CQq9zoTx28bzYp+QI40KWewMsq+rLL74xkGEH/f 06s1KnVTMEBhEt0iHGol/ulbpfhBffoqGcsGIgKWWN3nqAC10P+xuVnlzUBbAJo/gHkUKq A9NkAuiJ5DzjP17Gc7FB+iC8um7h6/nw3zTGLV3zRycNEy36dLA13N4hWFho5tRAXFcTMR nAA356pMydn9hVrfbYK1knPgfvsmRgAf8fiTgIVV6Afgxx5ZiFISFrVkpA+hxJoPOoWQDJ 8e7aqsJPhJ0rr0sxtZHMgZnJozHbAkw2xczYswSw6Go+PbLwOo+pTQSraw231w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682425748; 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=/kDRA+BZA8EDt+A/Uzi7DTww5gR3xuzJT3ehUT55kO0=; b=d4oj0rS84WwSHx2Wr6307aKvZ4YCeaJSEJsNC0BHA0Qh1Ry3jVGrOKNzyMvcVE66T88vUS wCgNgtejJZ2Qpp3GwgJVCQjGUpqb5xAFGbMphijRKphppWXhqnMq9+E15sG0fVyiJOuMng OmJYV16eKKrt4kON798uhewUVtBGeiS9YCWTj9fFkXxQh9Eykfwj4ndo1VSCvYM7Bm7shQ y84NAGz+9yVO3Bjq6c62rlSXlkAsl9VWPOZqHkOVSztBJqy5M+E2DR0H/QRyHtFJlhOWxP rK6gj/DCYzr/+bTh4HyJWrKiydlmSqYXuAbl0razwsglFqIG3cYnZ5/PahybUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682425748; a=rsa-sha256; cv=none; b=Pd8R9AihNnK7QyQGksqfEYc9BvzXelHSR09vnPvs7bpoEmniWURCY3Ldp0VxGanHV4Jqa5 HNDdffRFEmqZNIVNxtXgKmdcghomIbe643iiS0GxcwYDIMwDK1mei7XrysjGxGU2TIS7S/ 8aVFyIytYiKWhK2vnVxAGTixxFYSx/9PoOFt4Sd9/fV5jZWMluON9j9bNhEftfZbxxlLA3 76ZBD4JGV202tL1xh/hYwmvIxSdAbeaRl/3U1St78fiI674QB+7ShvNKzrAVcQ1z1MmD7o rliDvx6qOCC4w5W8K9evEBjU/nW/LwZrh3xN5kl9LcztsSdu39DZpONgjUc1wg== 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 4Q5LsJ2bfHz16LQ; Tue, 25 Apr 2023 12:29: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 33PCT8iw028871; Tue, 25 Apr 2023 12:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PCT81s028870; Tue, 25 Apr 2023 12:29:08 GMT (envelope-from git) Date: Tue, 25 Apr 2023 12:29:08 GMT Message-Id: <202304251229.33PCT81s028870@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: 896e22fbc6e7 - main - netlink: fix neighbour deleting for IPv6. 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: 896e22fbc6e730b7eb3047221560db8c5c00d958 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=896e22fbc6e730b7eb3047221560db8c5c00d958 commit 896e22fbc6e730b7eb3047221560db8c5c00d958 Author: Alexander V. Chernikov AuthorDate: 2023-04-25 12:27:02 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-25 12:27:02 +0000 netlink: fix neighbour deleting for IPv6. MFC after: 2 weeks --- sys/netlink/route/neigh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 97f438630503..65b5c2b8be4e 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -479,7 +479,8 @@ rtnl_handle_delneigh(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate * return (EAFNOSUPPORT); IF_AFDATA_WLOCK(attrs.nda_ifp); - struct llentry *lle = lla_lookup(llt, LLE_EXCLUSIVE, attrs.nda_dst); + struct llentry *lle = lla_lookup(llt, LLE_SF(attrs.ndm_family, LLE_EXCLUSIVE), + attrs.nda_dst); if (lle != NULL) { if ((lle->la_flags & LLE_IFADDR) != 0) { LLE_WUNLOCK(lle);