From owner-dev-commits-src-all@freebsd.org Thu Feb 18 08:48:20 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 734E45301AB; Thu, 18 Feb 2021 08:48:20 +0000 (UTC) (envelope-from nparhar@gmail.com) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dh7dw2f9Rz3RDy; Thu, 18 Feb 2021 08:48:20 +0000 (UTC) (envelope-from nparhar@gmail.com) Received: by mail-ej1-x633.google.com with SMTP id ly28so3664129ejb.13; Thu, 18 Feb 2021 00:48:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=z7waTr4CvQI+snUSmqR7g2yBe5SuJQ+GHIfYUt3eLCc=; b=c8ga7VMPFSZJroupBHIoJBr+wjDy07Sy+kQamWVzqv3LoCjmGJrRNm1Nmm7fHaFovu +TROJ9Z/3pmfT+CL2xOyIgQM/eDrkAq2eHOyHU2NKWXPNfyn9LAuOJ4bCLssl5ZHy/1D br3EE1J7sxcXkvWStHBLRNYur6uXWMCfBl3EKKRzBfh5yf80Gkel4rMOm9ujMwcB1WGA xRDgfEyvGMq6x91y3unYhEtQLRUoVAR8M4FoxbASymXz4Wv1e0MN/MgG11xKnWT5SmQX kUDGTl/DCH4hBffrCnAQDsNysibO6WezZK9aN3MpXOVErqEIDWYwT4i+1PFMcd3B0OJk TryA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=z7waTr4CvQI+snUSmqR7g2yBe5SuJQ+GHIfYUt3eLCc=; b=sWRy0x5HYCTnW4jTnBvnlUFs+PY6fyey0AyAPocK07DGLHFESOAq5+xOCDRn5hVs7u kSx3ho55yUeo4ErPUqvS8+6QWmdBgLZ5RtTq4ryiaXkn6Z9H6AYhFQwARMh7BKfwohR2 lMelQfZJsQ6cL4IOPDm9PvkJxDyxGKQTJcWauSdIiT1UhhuZgPe9zB/lPSe6ueLJ9ceg mY9ueUAN2Y6jfbQ2nhng3pTAJXI0uOzdbjYUx6dbvQAgmfaVwBP5WT7duBzUGmU4G9sc hsXFDvBqo5HSP88GwQfixKg8kJReZaE2dVWD6n+WjxwW/0SWr0v+g0dhKxGLDSXmCcNS jv9A== X-Gm-Message-State: AOAM5310SzWSaBYdmNLkvaj5iqVY5j64uiTgJAIcB4sSN+gGzKCUfmfz hqDEfjcfIPVMtE45ePsqO1tzv/ilwqLpwE53Az3iyxmhlnY= X-Google-Smtp-Source: ABdhPJz+dg8MIKH5MsCRFw7Yi2pCe0Ota9zAFfB2C7Q5Wks9lSa9OuSy82AsL/c7/h9jTZgnygN3ZQPoDo4l5wtLhW4= X-Received: by 2002:a17:906:2c56:: with SMTP id f22mr2971186ejh.16.1613638098140; Thu, 18 Feb 2021 00:48:18 -0800 (PST) MIME-Version: 1.0 References: <202102180627.11I6Rxa4030228@gitrepo.freebsd.org> In-Reply-To: <202102180627.11I6Rxa4030228@gitrepo.freebsd.org> From: Navdeep Parhar Date: Thu, 18 Feb 2021 00:48:06 -0800 Message-ID: Subject: Re: git: 0a4f851074a3 - main - Fix another pesky missing #ifdef TCPHPTS To: Randall Stewart Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Dh7dw2f9Rz3RDy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2021 08:48:20 -0000 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 wrote: > > The branch main has been updated by rrs: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0a4f851074a3ca74cd4859c20e7d9807b2aeca65 > > commit 0a4f851074a3ca74cd4859c20e7d9807b2aeca65 > Author: Randall Stewart > AuthorDate: 2021-02-18 06:27:30 +0000 > Commit: Randall Stewart > 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)