From nobody Fri Jun 12 12:48:49 2026 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB934387363; Fri, 15 May 2026 02:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=183.62.165.209 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778811269; cv=none; b=H6bK5rQeK2kl5oHSLRxyHT1jGf5cnhSqd84Qj5pStwpgkBeqz3HzjdwYMw44hxddd6AM/r/+n2Zp4X5iBdfT07ZtilDFuO9uGX16OX8qBbkbZY/e89ZHci/MuGXsJkK6+JyyFNFb1ZgC04ezNd94e8UaSxAYsXLswTGpRYdiiy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778811269; c=relaxed/simple; bh=5frOUZ5UqGVTaqdCTNubY/Zpz6V9myJkFEzJbKyGWcs=; h=Message-ID:Date:Mime-Version:From:To:Cc:Subject:Content-Type; b=jkT/VwAU7vE8QWxVHlzVhQsPEsMmkdeJiSc/9N56QSITnzLfKV730W7ULNL35C8Tp8J6XgqEbIt9x2y/jXxkgcP0V5NwJvOi5i7LAQYE7WEJOsZG8fKV31f9D2QtE15x5ZMjhm9UBbdYQ7gegKs9yfW+KpNys8+aq1Ty73UprEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn; spf=pass smtp.mailfrom=zte.com.cn; arc=none smtp.client-ip=183.62.165.209 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zte.com.cn Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4gGrNn1P7Bz4xQXS; Fri, 15 May 2026 10:14:17 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.99.176]) by mse-fl1.zte.com.cn with SMTP id 64F2E70E088146; Fri, 15 May 2026 10:14:07 +0800 (+08) (envelope-from qiu.yutan@zte.com.cn) Received: from mapi (xaxapp04[null]) by mapi (Zmail) with MAPI id mid32; Fri, 15 May 2026 10:14:08 +0800 (CST) X-Zmail-TransId: 2afb6a06817063d-ed5aa X-Mailer: Zmail v1.0 Message-ID: <20260515101408635T6_cWDYOWVYQleZjRtUS1@zte.com.cn> Date: Fri, 15 May 2026 10:14:08 +0800 (CST) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 From: To: , Cc: , , , , , , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIG5ldC1uZXh0XSBuZXQ6IG5laWdoOiBSZW5hbWUgTkVJR0hfVkFSX0lOVEVSVkFMX1BST0JFX1RJTUVfTVMgdG8gTkVJR0hfVkFSX0lOVEVSVkFMX1BST0JFX1RJTUU=?= X-MAIL: mse-fl1.zte.com.cn 64F2E70E088146 X-TLS: YES X-SPF-DOMAIN: zte.com.cn X-ENVELOPE-SENDER: qiu.yutan@zte.com.cn X-SPF: None X-SOURCE-IP: 10.5.228.132 unknown Fri, 15 May 2026 10:14:17 +0800 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6A068179.000/4gGrNn1P7Bz4xQXS Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Qiu Yutan During the initialization of arp_tbl, the enumeration constant name NEIGH_VAR_INTERVAL_PROBE_TIME_MS in the statement arp_tbl.parms.data[NEIGH_VAR_INTERVAL_PROBE_TIME_MS] =3D 5*HZ does not align with its actual meaning (jiffies). Using NEIGH_VAR_INTERVAL_PROBE_TIME is a better naming choice. Fixes: bf48c3fae6d7 ("Merge branch 'net-neigh-introduce-interval_probe_time= -for-periodic-probe'") Signed-off-by: Qiu Yutan --- include/net/neighbour.h | 2 +- net/core/neighbour.c | 8 ++++---- net/ipv4/arp.c | 2 +- net/ipv6/ndisc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 2dfee6d4258a..f317e910ec3c 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -49,7 +49,7 @@ enum { NEIGH_VAR_RETRANS_TIME, NEIGH_VAR_BASE_REACHABLE_TIME, NEIGH_VAR_DELAY_PROBE_TIME, - NEIGH_VAR_INTERVAL_PROBE_TIME_MS, + NEIGH_VAR_INTERVAL_PROBE_TIME, NEIGH_VAR_GC_STALETIME, NEIGH_VAR_QUEUE_LEN_BYTES, NEIGH_VAR_PROXY_QLEN, diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 9e12524b67fa..912e6ca3b26e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1670,7 +1670,7 @@ static void neigh_managed_work(struct work_struct *wo= rk) list_for_each_entry(neigh, &tbl->managed_list, managed_list) neigh_event_send_probe(neigh, NULL, false); queue_delayed_work(system_power_efficient_wq, &tbl->managed_work, - NEIGH_VAR(&tbl->parms, INTERVAL_PROBE_TIME_MS)); + NEIGH_VAR(&tbl->parms, INTERVAL_PROBE_TIME)); spin_unlock_bh(&tbl->lock); } @@ -2235,7 +2235,7 @@ static int neightbl_fill_parms(struct sk_buff *skb, s= truct neigh_parms *parms) nla_put_msecs(skb, NDTPA_LOCKTIME, NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD) || nla_put_msecs(skb, NDTPA_INTERVAL_PROBE_TIME_MS, - NEIGH_VAR(parms, INTERVAL_PROBE_TIME_MS), NDTPA_PAD)) + NEIGH_VAR(parms, INTERVAL_PROBE_TIME), NDTPA_PAD)) goto nla_put_failure; return nla_nest_end(skb, nest); @@ -2508,7 +2508,7 @@ static int neightbl_set(struct sk_buff *skb, struct n= lmsghdr *nlh, call_netevent_notifiers(NETEVENT_DELAY_PROBE_TIME_UPDATE, p); break; case NDTPA_INTERVAL_PROBE_TIME_MS: - NEIGH_VAR_SET(p, INTERVAL_PROBE_TIME_MS, + NEIGH_VAR_SET(p, INTERVAL_PROBE_TIME, nla_get_msecs(tbp[i])); break; case NDTPA_RETRANS_TIME: @@ -3804,7 +3804,7 @@ static struct neigh_sysctl_table { NEIGH_SYSCTL_USERHZ_JIFFIES_ENTRY(RETRANS_TIME, "retrans_time"), NEIGH_SYSCTL_JIFFIES_ENTRY(BASE_REACHABLE_TIME, "base_reachable_time"), NEIGH_SYSCTL_JIFFIES_ENTRY(DELAY_PROBE_TIME, "delay_first_probe_time"), - NEIGH_SYSCTL_MS_JIFFIES_POSITIVE_ENTRY(INTERVAL_PROBE_TIME_MS, + NEIGH_SYSCTL_MS_JIFFIES_POSITIVE_ENTRY(INTERVAL_PROBE_TIME, "interval_probe_time_ms"), NEIGH_SYSCTL_JIFFIES_ENTRY(GC_STALETIME, "gc_stale_time"), NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(QUEUE_LEN_BYTES, "unres_qlen_bytes"), diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 51d70180e1cc..601b98185cf5 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -169,7 +169,7 @@ struct neigh_table arp_tbl =3D { [NEIGH_VAR_RETRANS_TIME] =3D 1 * HZ, [NEIGH_VAR_BASE_REACHABLE_TIME] =3D 30 * HZ, [NEIGH_VAR_DELAY_PROBE_TIME] =3D 5 * HZ, - [NEIGH_VAR_INTERVAL_PROBE_TIME_MS] =3D 5 * HZ, + [NEIGH_VAR_INTERVAL_PROBE_TIME] =3D 5 * HZ, [NEIGH_VAR_GC_STALETIME] =3D 60 * HZ, [NEIGH_VAR_QUEUE_LEN_BYTES] =3D SK_WMEM_DEFAULT, [NEIGH_VAR_PROXY_QLEN] =3D 64, diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index e7ad13c5bd26..ca7df107e3bf 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -128,7 +128,7 @@ struct neigh_table nd_tbl =3D { [NEIGH_VAR_RETRANS_TIME] =3D ND_RETRANS_TIMER, [NEIGH_VAR_BASE_REACHABLE_TIME] =3D ND_REACHABLE_TIME, [NEIGH_VAR_DELAY_PROBE_TIME] =3D 5 * HZ, - [NEIGH_VAR_INTERVAL_PROBE_TIME_MS] =3D 5 * HZ, + [NEIGH_VAR_INTERVAL_PROBE_TIME] =3D 5 * HZ, [NEIGH_VAR_GC_STALETIME] =3D 60 * HZ, [NEIGH_VAR_QUEUE_LEN_BYTES] =3D SK_WMEM_DEFAULT, [NEIGH_VAR_PROXY_QLEN] =3D 64, --=20 2.25.1