From nobody Sun Feb 8 13:36:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565275056; cv=none; d=zoho.com; s=zohoarc; b=lGgBVj9oNmbG4Yp70R3fkmMrIT40HXMUgKTfvuuOR9EmA3rpLsBrxRfSnPzDlpkNOynDZM80xrYDFc6XVMG3DX0djTMbjvckuGmR+EqtHEvcVpNKz3UARSap1rAwdptDIACFtOQoMblTWiZxyg/Jh/Hn0jjRvGpiszWPeCoAeTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565275056; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=b5/NnMIYTPicvvll/vCiHM4J3JfKbJNX1mZH866peNA=; b=mrA/3BRxHGrf4sCRw7RRI+3NLWGK93W/TuM52JMUhSxITmMmALjAfyyFrbjX9WDGaGNIMt59k3BvlK2PsuQUiTZkPfewwXzY8SCMxk5spCFRYz8gQ7C6o863wcE8FuhWlHvFo+J46++udVjnpQ4brRklSa/+gf9pP16MXoZ6Uj8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565275056038177.9381499241075; Thu, 8 Aug 2019 07:37:36 -0700 (PDT) Received: from localhost ([::1]:52330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvjXr-0003iQ-1A for importer@patchew.org; Thu, 08 Aug 2019 10:37:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57146) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvjX8-0001zB-Fx for qemu-devel@nongnu.org; Thu, 08 Aug 2019 10:36:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvjX7-00062t-9Q for qemu-devel@nongnu.org; Thu, 08 Aug 2019 10:36:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvjX5-00061v-Ax for qemu-devel@nongnu.org; Thu, 08 Aug 2019 10:36:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 68E0330A00DC; Thu, 8 Aug 2019 14:36:46 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F31E51001956; Thu, 8 Aug 2019 14:36:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 8 Aug 2019 16:34:55 +0200 Message-Id: <20190808143457.14111-5-philmd@redhat.com> In-Reply-To: <20190808143457.14111-1-philmd@redhat.com> References: <20190808143457.14111-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 08 Aug 2019 14:36:46 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 4/6] hw/net/vmxnet3: Use the tcp_header structure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitry Fleytman , Li Zhijian , "Michael S. Tsirkin" , Jason Wang , Zhang Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The tcp_header structure comes convenient macros to avoid manipulating the TCP header flags/offset bits manually. Replace the tcp_hdr structure by the tcp_header equivalent, and use the macros. Since we will remove the duplicated TCP_FLAG_ACK definition in the next commit, replace its use now. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC: Verify th_off endianess hw/net/net_rx_pkt.c | 2 +- hw/net/net_tx_pkt.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index 98a5030ace..7558f0646a 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -376,7 +376,7 @@ bool net_rx_pkt_is_tcp_ack(struct NetRxPkt *pkt) assert(pkt); =20 if (pkt->istcp) { - return TCP_HEADER_FLAGS(&pkt->l4hdr_info.hdr.tcp) & TCP_FLAG_ACK; + return TCP_HEADER_FLAGS(&pkt->l4hdr_info.hdr.tcp) & TH_ACK; } =20 return false; diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c index 162f802dd7..fc4514416c 100644 --- a/hw/net/net_tx_pkt.c +++ b/hw/net/net_tx_pkt.c @@ -307,7 +307,7 @@ func_exit: void net_tx_pkt_build_vheader(struct NetTxPkt *pkt, bool tso_enable, bool csum_enable, uint32_t gso_size) { - struct tcp_hdr l4hdr; + struct tcp_header l4hdr; assert(pkt); =20 /* csum has to be enabled if tso is. */ @@ -330,7 +330,8 @@ void net_tx_pkt_build_vheader(struct NetTxPkt *pkt, boo= l tso_enable, case VIRTIO_NET_HDR_GSO_TCPV6: iov_to_buf(&pkt->vec[NET_TX_PKT_PL_START_FRAG], pkt->payload_frags, 0, &l4hdr, sizeof(l4hdr)); - pkt->virt_hdr.hdr_len =3D pkt->hdr_len + l4hdr.th_off * sizeof(uin= t32_t); + pkt->virt_hdr.hdr_len =3D pkt->hdr_len + + TCP_HEADER_DATA_OFFSET(&l4hdr) * sizeof(uint= 32_t); pkt->virt_hdr.gso_size =3D gso_size; break; =20 @@ -343,7 +344,7 @@ void net_tx_pkt_build_vheader(struct NetTxPkt *pkt, boo= l tso_enable, case IP_PROTO_TCP: pkt->virt_hdr.flags =3D VIRTIO_NET_HDR_F_NEEDS_CSUM; pkt->virt_hdr.csum_start =3D pkt->hdr_len; - pkt->virt_hdr.csum_offset =3D offsetof(struct tcp_hdr, th_sum); + pkt->virt_hdr.csum_offset =3D offsetof(struct tcp_header, th_s= um); break; case IP_PROTO_UDP: pkt->virt_hdr.flags =3D VIRTIO_NET_HDR_F_NEEDS_CSUM; --=20 2.20.1