Skip to content

Commit fc5c7c8

Browse files
Fix LINT build #2 after r360292.
Pointyhat to: melifaro
1 parent f6b8518 commit fc5c7c8

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

sys/kern/uipc_ktls.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ __FBSDID("$FreeBSD$");
6161
#include <net/nhop.h>
6262
#include <net/rss_config.h>
6363
#endif
64+
#include <net/route.h>
65+
#include <net/route/nhop.h>
6466
#if defined(INET) || defined(INET6)
6567
#include <netinet/in.h>
6668
#include <netinet/in_pcb.h>

sys/netinet/sctp_output.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13901,7 +13901,7 @@ sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t *ro)
1390113901
sin = &ro->ro_nh->gw4_sa;
1390213902
gwnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr);
1390313903
SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: nexthop is ");
13904-
SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &ro->ro_nh->gw4_sa);
13904+
SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &ro->ro_nh->gw_sa);
1390513905
SCTPDBG(SCTP_DEBUG_OUTPUT1, "network address is %x\n", gwnetaddr.s_addr);
1390613906
if (srcnetaddr.s_addr == gwnetaddr.s_addr) {
1390713907
return (1);

sys/netinet/tcp_stacks/rack.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
6868
#include <vm/uma.h>
6969

7070
#include <net/route.h>
71+
#include <net/route/nhop.h>
7172
#include <net/vnet.h>
7273

7374
#define TCPSTATES /* for logging */
@@ -9778,8 +9779,8 @@ rack_output(struct tcpcb *tp)
97789779
((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0),
97799780
NULL, NULL, inp);
97809781

9781-
if (error == EMSGSIZE && inp->inp_route6.ro_rt != NULL)
9782-
mtu = inp->inp_route6.ro_rt->rt_mtu;
9782+
if (error == EMSGSIZE && inp->inp_route6.ro_nh != NULL)
9783+
mtu = inp->inp_route6.ro_nh->nh_mtu;
97839784
}
97849785
#endif /* INET6 */
97859786
#if defined(INET) && defined(INET6)
@@ -9819,8 +9820,8 @@ rack_output(struct tcpcb *tp)
98199820
error = ip_output(m, tp->t_inpcb->inp_options, &inp->inp_route,
98209821
((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
98219822
inp);
9822-
if (error == EMSGSIZE && inp->inp_route.ro_rt != NULL)
9823-
mtu = inp->inp_route.ro_rt->rt_mtu;
9823+
if (error == EMSGSIZE && inp->inp_route.ro_nh != NULL)
9824+
mtu = inp->inp_route.ro_nh->nh_mtu;
98249825
}
98259826
#endif /* INET */
98269827

0 commit comments

Comments
 (0)