Date: Thu, 7 Jan 2021 18:20:44 GMT From: Alexander Motin <mav@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 6bebabe0943e - stable/12 - V_ip6_forwarding and V_ipforwarding have been defined in ip6_var.h / ip_var.h since at least 2008, so make use of those definitions here. Message-ID: <202101071820.107IKiNS073857@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=6bebabe0943e0774dbf8e9ef7c052200272323a5 commit 6bebabe0943e0774dbf8e9ef7c052200272323a5 Author: Marko Zec <zec@FreeBSD.org> AuthorDate: 2019-06-19 08:49:24 +0000 Commit: Alexander Motin <mav@FreeBSD.org> CommitDate: 2021-01-07 17:42:46 +0000 V_ip6_forwarding and V_ipforwarding have been defined in ip6_var.h / ip_var.h since at least 2008, so make use of those definitions here. (cherry picked from commit 188adcb7e471a228398a6d879c65ca5e65333c1c) --- sys/net/iflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 4b5e73ce08e0..eddfb9bc8f9b 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2767,10 +2767,10 @@ iflib_get_ip_forwarding(struct lro_ctrl *lc, bool *v4, bool *v6) { CURVNET_SET(lc->ifp->if_vnet); #if defined(INET6) - *v6 = VNET(ip6_forwarding); + *v6 = V_ip6_forwarding; #endif #if defined(INET) - *v4 = VNET(ipforwarding); + *v4 = V_ipforwarding; #endif CURVNET_RESTORE(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101071820.107IKiNS073857>