Date: Sat, 25 Apr 2020 11:35:38 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360296 - in head/sys: kern netinet netinet/tcp_stacks Message-ID: <202004251135.03PBZccB017829@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: melifaro Date: Sat Apr 25 11:35:38 2020 New Revision: 360296 URL: https://svnweb.freebsd.org/changeset/base/360296 Log: Fix LINT build #2 after r360292. Pointyhat to: melifaro Modified: head/sys/kern/uipc_ktls.c head/sys/netinet/sctp_output.c head/sys/netinet/tcp_stacks/rack.c Modified: head/sys/kern/uipc_ktls.c ============================================================================== --- head/sys/kern/uipc_ktls.c Sat Apr 25 10:31:56 2020 (r360295) +++ head/sys/kern/uipc_ktls.c Sat Apr 25 11:35:38 2020 (r360296) @@ -61,6 +61,8 @@ __FBSDID("$FreeBSD$"); #include <net/nhop.h> #include <net/rss_config.h> #endif +#include <net/route.h> +#include <net/route/nhop.h> #if defined(INET) || defined(INET6) #include <netinet/in.h> #include <netinet/in_pcb.h> Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Sat Apr 25 10:31:56 2020 (r360295) +++ head/sys/netinet/sctp_output.c Sat Apr 25 11:35:38 2020 (r360296) @@ -13901,7 +13901,7 @@ sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_r sin = &ro->ro_nh->gw4_sa; gwnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr); SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: nexthop is "); - SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &ro->ro_nh->gw4_sa); + SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &ro->ro_nh->gw_sa); SCTPDBG(SCTP_DEBUG_OUTPUT1, "network address is %x\n", gwnetaddr.s_addr); if (srcnetaddr.s_addr == gwnetaddr.s_addr) { return (1); Modified: head/sys/netinet/tcp_stacks/rack.c ============================================================================== --- head/sys/netinet/tcp_stacks/rack.c Sat Apr 25 10:31:56 2020 (r360295) +++ head/sys/netinet/tcp_stacks/rack.c Sat Apr 25 11:35:38 2020 (r360296) @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include <vm/uma.h> #include <net/route.h> +#include <net/route/nhop.h> #include <net/vnet.h> #define TCPSTATES /* for logging */ @@ -9778,8 +9779,8 @@ send: ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), NULL, NULL, inp); - if (error == EMSGSIZE && inp->inp_route6.ro_rt != NULL) - mtu = inp->inp_route6.ro_rt->rt_mtu; + if (error == EMSGSIZE && inp->inp_route6.ro_nh != NULL) + mtu = inp->inp_route6.ro_nh->nh_mtu; } #endif /* INET6 */ #if defined(INET) && defined(INET6) @@ -9819,8 +9820,8 @@ send: error = ip_output(m, tp->t_inpcb->inp_options, &inp->inp_route, ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0, inp); - if (error == EMSGSIZE && inp->inp_route.ro_rt != NULL) - mtu = inp->inp_route.ro_rt->rt_mtu; + if (error == EMSGSIZE && inp->inp_route.ro_nh != NULL) + mtu = inp->inp_route.ro_nh->nh_mtu; } #endif /* INET */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004251135.03PBZccB017829>