From nobody Sun Oct 02 04:30:07 2022 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 4Mg9xC6MN5z4dtQB; Sun, 2 Oct 2022 04:30:07 +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 4Mg9xC1sznz46vg; Sun, 2 Oct 2022 04:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685007; 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=FbfoQ0laH1DWbzc1yr8Ew2WAwJ7beqlU/klNrDuW0Ro=; b=eIvt2yWkAkb03BsG/cynOfb6jqK9Rys/lNu0SnkGNwnFxUItugxu4hoG8atoy7KspfKBvH pR5wsEiyQDZ7F2qaivULJMOG0HHczgoemlZJtbOKAK82I3co4lGMQIcAtCzxnEPspbjnvQ 0JZwkFF27AT2EqMYV1szY4ATq7VZYf6MBnW5mOu24RQdjjT5JOt4xFnL2ev3H6kLxbriT1 PcBAXQqceebIxqu5mU1HO3ozkqMOnSQOQrcbhzD1qOrAn3bL8hUAAAeXaIXG5W4zUvncXx 0swHN+fBs2rFg15hspDVXTmByDmLUDtQp4M6G7t1wbJxrrxyt/oBCaJVv4W/Wg== 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 4Mg9xC0z11zlVw; Sun, 2 Oct 2022 04:30:07 +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 2924U7hT061704; Sun, 2 Oct 2022 04:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924U7e2061701; Sun, 2 Oct 2022 04:30:07 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:30:07 GMT Message-Id: <202210020430.2924U7e2061701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: dd5cba624e7f - stable/13 - get_nhop: eliminate write only variable gateway 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd5cba624e7f8e5b5490ea63ea62ed0e3ca92721 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664685007; 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=FbfoQ0laH1DWbzc1yr8Ew2WAwJ7beqlU/klNrDuW0Ro=; b=nNAJwDjxvX2gvh84IVcjB2mln+v4TF8noyzcIlv/xodiXZGUAPa4o59VgIKTLMieIScGmF 8lw2oXk5cy3+yJhY6sMJnH76M2lOKRWyCsYnV5JLboPSFY5XWJATmIh8qLWY8UVuojtftL LkmxPLB5K6hNUgRsiseoWg7P7gYaON+Aits0DIveXDkhDHsBaBZ8tqOoVJ9NR3lnfS2G1+ 9GKaMqRzqXihVSIdI7U6sHagKtKslKdzTAvelh4PQ6ucb0/l9RmP2QFIiNIvvy346SwagO AzhARD0NtnV/RgkPEkK+RLElY7ffDXCUnnA/JhFZrLjHM/yIXyh2UK0+4/wg1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664685007; a=rsa-sha256; cv=none; b=Jpc3NMGYGLobLGrayKKSjmZdCCvCtyFRr38A90Rh9euMsSJOUXvwCkLLuLprvw7PltmACQ 4Y2wHjj8B8MEGEIVVQcXolUBSOsy4DzHb211CIn6hFLwNZVvAilq3gPK9FTDgy8/JExZJO 0r6Hft/KUCetSWbtQJpd8hJ9eLOCo2YFgA9UkS/pNAbu004Rj+mR37VHCIovYpn1MiIdgT urcX/k5q94OkQv+GQ3IDyW3VhVig8kcLgFhbBWpi+0hdvSJJo5Qd/VJ2xawXBMVzoA3yid 9lPYikn36//wWUW/yAW8y2reMfpd+UjL0KBQvqjil6HdDWmrhE5Ioo7S7tyOsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dd5cba624e7f8e5b5490ea63ea62ed0e3ca92721 commit dd5cba624e7f8e5b5490ea63ea62ed0e3ca92721 Author: Warner Losh AuthorDate: 2022-07-08 17:53:34 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:56 +0000 get_nhop: eliminate write only variable gateway Sponsored by: Netflix (cherry picked from commit 7f9c3339a4ff5fecab3f408ba86afd3c5b778bd3) --- sys/net/route/nhop_ctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/route/nhop_ctl.c b/sys/net/route/nhop_ctl.c index 56d30405fc1e..5dfc275cd1e7 100644 --- a/sys/net/route/nhop_ctl.c +++ b/sys/net/route/nhop_ctl.c @@ -354,7 +354,7 @@ static int get_nhop(struct rib_head *rnh, struct rt_addrinfo *info, struct nhop_priv **pnh_priv) { - const struct sockaddr *dst, *gateway, *netmask; + const struct sockaddr *dst, *netmask; struct nhop_priv *nh_priv, *tmp_priv; int error; @@ -363,7 +363,6 @@ get_nhop(struct rib_head *rnh, struct rt_addrinfo *info, /* Give the protocols chance to augment the request data */ dst = info->rti_info[RTAX_DST]; netmask = info->rti_info[RTAX_NETMASK]; - gateway = info->rti_info[RTAX_GATEWAY]; error = rnh->rnh_preadd(rnh->rib_fibnum, dst, netmask, nh_priv->nh); if (error != 0) {