From patchwork Mon Apr 27 10:24:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 1277517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=H1/kQldc; dkim-atps=neutral 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 499gtd0Ks8z9sSc for ; Mon, 27 Apr 2020 20:26:49 +1000 (AEST) Received: from localhost ([::1]:37382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT0yM-0001qv-TB for incoming@patchwork.ozlabs.org; Mon, 27 Apr 2020 06:26:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43098) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT0wI-0000UV-Cl for qemu-devel@nongnu.org; Mon, 27 Apr 2020 06:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT0wC-0005fX-LX for qemu-devel@nongnu.org; Mon, 27 Apr 2020 06:24:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56634 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jT0wC-0005f6-8K for qemu-devel@nongnu.org; Mon, 27 Apr 2020 06:24:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587983070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ra7aW7uNGiw8iPZbhmCLLgBCNHpVQnxVEG+Vv9atVfc=; b=H1/kQldce3nOGNgZnpVb8c6o2A4i6b4rYzjBUW49XLMnA4Ab0YGbgKb7n4+0iY9oSxuqn4 edEpbVSOmomHfmrjmtgwlfs2ehItvUzva4hWeSiU11ptqRoq4GAICnGS1QjcZvbTHy+nYB yvnf0ny8PODHGXq8xdLrkag/mAeWWzQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-178-0RNogpTOOW6MLzuFtDaK8g-1; Mon, 27 Apr 2020 06:24:28 -0400 X-MC-Unique: 0RNogpTOOW6MLzuFtDaK8g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD647801504; Mon, 27 Apr 2020 10:24:27 +0000 (UTC) Received: from localhost (ovpn-112-184.ams2.redhat.com [10.36.112.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F6DE60CD3; Mon, 27 Apr 2020 10:24:23 +0000 (UTC) From: Cornelia Huck To: "Michael S . Tsirkin" , Jason Wang , Paolo Bonzini Subject: [PATCH 1/3] virtio-net: fix rsc_ext compat handling Date: Mon, 27 Apr 2020 12:24:13 +0200 Message-Id: <20200427102415.10915-2-cohuck@redhat.com> In-Reply-To: <20200427102415.10915-1-cohuck@redhat.com> References: <20200427102415.10915-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=cohuck@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 01:12:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Yuri Benditovich , Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" virtio_net_rsc_ext_num_{packets,dupacks} needs to be available independently of the presence of VIRTIO_NET_HDR_F_RSC_INFO. Fixes: 2974e916df87 ("virtio-net: support RSC v4/v6 tcp traffic for Windows HCK") Signed-off-by: Cornelia Huck --- hw/net/virtio-net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a46e3b37a7cd..e85d902588b3 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -83,6 +83,8 @@ #define VIRTIO_NET_HDR_F_RSC_INFO 4 /* rsc_ext data in csum_ fields */ #define VIRTIO_NET_F_RSC_EXT 61 +#endif + static inline __virtio16 *virtio_net_rsc_ext_num_packets( struct virtio_net_hdr *hdr) { @@ -95,8 +97,6 @@ static inline __virtio16 *virtio_net_rsc_ext_num_dupacks( return &hdr->csum_offset; } -#endif - static VirtIOFeature feature_sizes[] = { {.flags = 1ULL << VIRTIO_NET_F_MAC, .end = endof(struct virtio_net_config, mac)},