The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=ab4fad4be14462e347ed24ee3663a18eacfb138e
commit ab4fad4be14462e347ed24ee3663a18eacfb138e Author: Randall Stewart <[email protected]> AuthorDate: 2021-02-17 17:49:42 +0000 Commit: Randall Stewart <[email protected]> CommitDate: 2021-02-17 17:49:42 +0000 Add ifdef TCPHPTS around build_ack_entry and do_bpf_and_csum to avoid warnings when HPTS is not included Thanks to Gary Jennejohn for pointing this out. --- sys/netinet/tcp_lro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index aea55d7ae33f..199b7f9a79a0 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -1293,6 +1293,7 @@ lro_set_mtime(struct timeval *tv, struct timespec *ts) tv->tv_usec = ts->tv_nsec / 1000; } +#ifdef TCPHPTS static void build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, uint16_t hdr_len, uint16_t iptos) { @@ -1487,6 +1488,7 @@ do_bpf_and_csum(struct inpcb *inp, struct lro_ctrl *lc, struct lro_entry *le, } /* end switch */ return (m); } +#endif static int tcp_lro_rx2(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum, int use_hash) _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
