git: 0a4f851074a3 - main - Fix another pesky missing #ifdef TCPHPTS

Navdeep Parhar nparhar at gmail.com
Thu Feb 18 08:48:20 UTC 2021


I still get build failures in tcp_lro.c for i386/amd64 LINT-NOINET
builds after this.

--- tcp_lro.o ---
/storage/src/head/sys/netinet/tcp_lro.c:1359:10: error: unused
variable 'iptos' [-Werror,-Wunused-variable]
        uint8_t iptos;
                ^
1 error generated.
*** [tcp_lro.o] Error code 1

make[5]: stopped in /storage/obj/storage/src/head/amd64.amd64/sys/LINT-NOINET

Regards,
Navdeep

On Wed, Feb 17, 2021 at 10:28 PM Randall Stewart <rrs at freebsd.org> wrote:
>
> The branch main has been updated by rrs:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=0a4f851074a3ca74cd4859c20e7d9807b2aeca65
>
> commit 0a4f851074a3ca74cd4859c20e7d9807b2aeca65
> Author:     Randall Stewart <rrs at FreeBSD.org>
> AuthorDate: 2021-02-18 06:27:30 +0000
> Commit:     Randall Stewart <rrs at FreeBSD.org>
> CommitDate: 2021-02-18 06:27:30 +0000
>
>     Fix another pesky missing #ifdef TCPHPTS
> ---
>  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 199b7f9a79a0..a8e751b67071 100644
> --- a/sys/netinet/tcp_lro.c
> +++ b/sys/netinet/tcp_lro.c
> @@ -470,6 +470,7 @@ tcp_lro_rx_ipv4(struct lro_ctrl *lc, struct mbuf *m, struct ip *ip4,
>  }
>  #endif
>
> +#ifdef TCPHPTS
>  static void
>  tcp_lro_log(struct tcpcb *tp, struct lro_ctrl *lc,
>             struct lro_entry *le, struct mbuf *m, int frm, int32_t tcp_data_len,
> @@ -520,6 +521,7 @@ tcp_lro_log(struct tcpcb *tp, struct lro_ctrl *lc,
>                                0, &log, false, &tv);
>         }
>  }
> +#endif
>
>  static void
>  tcp_flush_out_le(struct tcpcb *tp, struct lro_ctrl *lc, struct lro_entry *le)


More information about the dev-commits-src-main mailing list