From nobody Fri Jan 12 21:10:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TBZ1p39zPz56N08; Fri, 12 Jan 2024 21:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TBZ1p2Flyz4Vm2; Fri, 12 Jan 2024 21:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705093822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VejDXPJFKYgRq23Es+p/vBfZFYBKov5RQHRqe3kgIO4=; b=KJZ1fL6OKCvPF9R+qVgfdGxZ3L7FbGxlNvepHotnDeoaTgWy6cnr/x91mBWgdw0SxcXm1c TWGWrFr+ia1+r76k61nLQ19VEWiGn0ScXik/PnKyjnK8dvOX1I6rpbXIKzUsBIgTvt+TTp ujKlq33+i/WlLZN/fWpXG0J7MPFXSIx5rvszSLWizawpoiGKcGIDZ2ZtpfiU01xxBzWYP+ dagrst68gSI7PtrrmvHTAL6ffvW5bNOQfZkCjNa0VS7/UuZTe7ExMNBA4fxY32wafm6msq Sn6gpmh/DkVKug7lUCVz8XmCS6EsDD2NM0ccg4lHOZ4XiMmZT5F9O8JFa5CWcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705093822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VejDXPJFKYgRq23Es+p/vBfZFYBKov5RQHRqe3kgIO4=; b=FkVTzYJ3Ldn1rsLZXzNTa25mj/oXfxd6V0nlk6bnyVEDmgHriLjCireurfeoWTCzA9bEvl mc1xW9E/j1qe4jI2m/Rc8zy8wgymuCOiqQ9DsyWUCbmRNG55FmggRH5DHpeuBfVqUApeqm xChXhwEo0mcxItHOVvdq5iQupkGSG0eKUDtmlmEZGRduvYUz0NenJKzh84GlvGL63PwM3X jWuGeOiYngQXcvAjUicVkUy8VSeU3WSbfdgsH1eDrK6cRfMNURlgArvenRstrDl1xqpRbY YnFz5yczHgjSw0UfwMR0h/mjvZ9U18qNxbaN0fUSh+u/1FN5zO4Fn9Ychkvbkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705093822; a=rsa-sha256; cv=none; b=jBnaZkz+ISPs2gzKVuD800qJw9JnuBilhC0UhGH9uRC/yeYpdnHFmTrwKLe1a5AISCf2EA 7o3LqYY9ckcQeqeDHrVxKxEh+A3K3VOBYzMuyDigv7VngyTFanEPgC2uXeUoOF06nvpxx+ 6URWg8/98uu2tXS+m0bFMnhobBD6Yqn2Gn+eMcukCEDXb8381ZnWpvk81M95U43tEMxb9n 77/FJWxWRBzqw4MZ1MOyD2nNXRF0cZY3JGQWZQoY2Fkuybe0LIXzc4BW6tXNOmWdaMELWn 6I85T1uIJzlKPX//nf9RRuSGh+Fh0rn9N0+PErhFVyfpOQ8ei+OJliqLdAl6Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TBZ1p1JBpz1HcX; Fri, 12 Jan 2024 21:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CLAME2032317; Fri, 12 Jan 2024 21:10:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CLAM2t032314; Fri, 12 Jan 2024 21:10:22 GMT (envelope-from git) Date: Fri, 12 Jan 2024 21:10:22 GMT Message-Id: <202401122110.40CLAM2t032314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4c4633fdffbe - stable/13 - if_tuntap: fix NOIP build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c4633fdffbe8e4b6d328c2bc9bb3edacc9ab50a Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4c4633fdffbe8e4b6d328c2bc9bb3edacc9ab50a commit 4c4633fdffbe8e4b6d328c2bc9bb3edacc9ab50a Author: Gleb Smirnoff AuthorDate: 2023-12-04 18:18:56 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 21:09:27 +0000 if_tuntap: fix NOIP build Note: this removes one TUNDEBUG() for the sake of not having one more ifdefed variable declaration and for the overall code brevity. The call from tuntap into LRO can be so easily traced with dtrace(1) that an 80-ish printf(9)-based debugging can be omitted. Fixes: 99c79cab422705f92f05a2924a29bdf823372ebf (cherry picked from commit 5b0010b4678d778967a5a82fb38507e46a071e38) --- sys/net/if_tuntap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index a2eecd31723d..a6695adc93c5 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -1171,13 +1171,13 @@ tundtor(void *data) if ((tp->tun_flags & TUN_VMNET) != 0 || (l2tun && (ifp->if_flags & IFF_LINK0) != 0)) goto out; - +#if defined(INET) || defined(INET6) if (l2tun && tp->tun_lro_ready) { TUNDEBUG (ifp, "LRO disabled\n"); tcp_lro_free(&tp->tun_lro); tp->tun_lro_ready = false; } - +#endif if (ifp->if_flags & IFF_UP) { TUN_UNLOCK(tp); if_down(ifp); @@ -1222,6 +1222,7 @@ tuninit(struct ifnet *ifp) getmicrotime(&ifp->if_lastchange); TUN_UNLOCK(tp); } else { +#if defined(INET) || defined(INET6) if (tcp_lro_init(&tp->tun_lro) == 0) { TUNDEBUG(ifp, "LRO enabled\n"); tp->tun_lro.ifp = ifp; @@ -1230,6 +1231,7 @@ tuninit(struct ifnet *ifp) TUNDEBUG(ifp, "Could not enable LRO\n"); tp->tun_lro_ready = false; } +#endif ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; TUN_UNLOCK(tp); /* attempt to start output */ @@ -1776,7 +1778,6 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, struct epoch_tracker et; struct ether_header *eh; struct ifnet *ifp; - int result; ifp = TUN2IFP(tp); @@ -1832,14 +1833,12 @@ tunwrite_l2(struct tuntap_softc *tp, struct mbuf *m, /* Pass packet up to parent. */ CURVNET_SET(ifp->if_vnet); NET_EPOCH_ENTER(et); - if (tp->tun_lro_ready && ifp->if_capenable & IFCAP_LRO) { - result = tcp_lro_rx(&tp->tun_lro, m, 0); - TUNDEBUG(ifp, "tcp_lro_rx() returned %d\n", result); - } else - result = TCP_LRO_CANNOT; - if (result == 0) +#if defined(INET) || defined(INET6) + if (tp->tun_lro_ready && ifp->if_capenable & IFCAP_LRO && + tcp_lro_rx(&tp->tun_lro, m, 0) == 0) tcp_lro_flush_all(&tp->tun_lro); else +#endif (*ifp->if_input)(ifp, m); NET_EPOCH_EXIT(et); CURVNET_RESTORE();