From patchwork Thu Aug 8 14:34:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1144050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4649sn44vMz9sDB for ; Fri, 9 Aug 2019 00:36:13 +1000 (AEST) Received: from localhost ([::1]:52298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvjWV-0000Kq-M6 for incoming@patchwork.ozlabs.org; Thu, 08 Aug 2019 10:36:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56972) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvjWG-0000GQ-5L for qemu-devel@nongnu.org; Thu, 08 Aug 2019 10:35:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvjWE-0005dx-5k for qemu-devel@nongnu.org; Thu, 08 Aug 2019 10:35:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvjWC-0005dK-85 for qemu-devel@nongnu.org; Thu, 08 Aug 2019 10:35:53 -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 4DBAB3061524; Thu, 8 Aug 2019 14:35:51 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02A791001B07; Thu, 8 Aug 2019 14:35:21 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 8 Aug 2019 16:34:52 +0200 Message-Id: <20190808143457.14111-2-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.42]); Thu, 08 Aug 2019 14:35:51 +0000 (UTC) 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 1/6] hw/net/virtio-net: Use TCP_HEADER_FLAGS/TCP_HEADER_DATA_OFFSET macros 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_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" "net/eth.h" provides convenient macros to avoid manipulating the TCP header flags/offset bits manually, let's use them. Signed-off-by: Philippe Mathieu-Daudé --- RFC: Check the macro uses the correct bits hw/net/virtio-net.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index b9e1cd71cf..867f50613e 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -46,9 +46,6 @@ #define VIRTIO_NET_IP4_ADDR_SIZE 8 /* ipv4 saddr + daddr */ -#define VIRTIO_NET_TCP_FLAG 0x3F -#define VIRTIO_NET_TCP_HDR_LENGTH 0xF000 - /* IPv4 max payload, 16 bits in the header */ #define VIRTIO_NET_MAX_IP4_PAYLOAD (65535 - sizeof(struct ip_header)) #define VIRTIO_NET_MAX_TCP_PAYLOAD 65535 @@ -1658,10 +1655,8 @@ static int virtio_net_rsc_tcp_ctrl_check(VirtioNetRscChain *chain, uint16_t tcp_hdr; uint16_t tcp_flag; - tcp_flag = htons(tcp->th_offset_flags); - tcp_hdr = (tcp_flag & VIRTIO_NET_TCP_HDR_LENGTH) >> 10; - tcp_flag &= VIRTIO_NET_TCP_FLAG; - tcp_flag = htons(tcp->th_offset_flags) & 0x3F; + tcp_hdr = TCP_HEADER_DATA_OFFSET(tcp); + tcp_flag = TCP_HEADER_FLAGS(tcp); if (tcp_flag & TH_SYN) { chain->stat.tcp_syn++; return RSC_BYPASS;