From patchwork Tue Feb 16 22:47:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1441140 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=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=SPg9GuHl; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DgGMz6nLDz9sBy for ; Wed, 17 Feb 2021 09:48:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C8E6E6F605 for ; Tue, 16 Feb 2021 22:48:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6aZUn59fTkLb for ; Tue, 16 Feb 2021 22:48:10 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id DADBD6F5D7; Tue, 16 Feb 2021 22:48:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTP id 087F76F4B8; Tue, 16 Feb 2021 22:47:59 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CEF93C0174; Tue, 16 Feb 2021 22:47:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id A72B9C013A for ; Tue, 16 Feb 2021 22:47:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8DBF9871BF for ; Tue, 16 Feb 2021 22:47:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id so9cqHq2VtJg for ; Tue, 16 Feb 2021 22:47:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by hemlock.osuosl.org (Postfix) with ESMTPS id 136C0871BE for ; Tue, 16 Feb 2021 22:47:58 +0000 (UTC) Received: by mail-pg1-f180.google.com with SMTP id o7so7227201pgl.1 for ; Tue, 16 Feb 2021 14:47:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=aOWQEcGLEHzMmkEY7/btSl9xftyLJ4pShcReqDETdI8=; b=SPg9GuHltE4gEWNLVoe6HdsSX24LC90XXjjPHWWKmbtFb5XJMlFgeUMioj57j1Pahl 6b5mCeRib2GZTocVoHfwTHLKzw5qZH/CBX9riCI7O4M2/y08Quhl5PbcZujuyLsXI7Jp R6KhZl83Wu9jAf99Yd1FKrBQC24VnbQ41GdexL4U00O8pFh7rg/1Hmh9B4tDlACj6389 xqsyYd1CVuKbPsieHvAgOH86hEVZkgWfameMNB7rl85Kpe7hmonFFI5OUtfiBsxsMGfb icDFRuj8KMlQ9Mpya1CybQCbNKriPQ89/6Ku+PZh3vq8eSp1J+VGuP8H3v0PDMKZid5+ Bitw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aOWQEcGLEHzMmkEY7/btSl9xftyLJ4pShcReqDETdI8=; b=rBgJIlYt9KctWgMtb0DwN5drWj7/XQJOzlSyhVNKelXyp3t8u2UEYzfGL46QigflTX V2lSSpLvZawH4Q6pajFAWXlsqEHiMF/NOODFLXWbDWmh8fwVHrwnoNGY6FsRbtwuPhOb fBXfMTPC4OA700bce2jxjf0JZ0pEa2OWm6MxAL8q5Ke/X4pQnZp9nguFhz8s6ZHSVdAq MStkIwFjhB5NVZCdFAqUX40ZH5oSpxDfPlmMopMPPA46+MoEvg0s0+bEdmWrTx8qarO+ 17EWndwAa4CgDpbRm6IrU+h101HRKisyVoaXi6sBiVoiN05T/kMcR/i9JjgpRZ5ub+S+ t+fw== X-Gm-Message-State: AOAM530gZpXeGuFKsGbuwaQmzsYWTTpnMww223xDNBGjRTX/1uVpbRb9 QFOk7z/EVmhWi4oCZNjH/668BIj64DE= X-Google-Smtp-Source: ABdhPJyaoGIA6LAAKUeOncylSAfzXkf2EYFzDGQr5Kp3pKNmX3VdUcKQuIGXjpZX2bebLY1X39Vf5A== X-Received: by 2002:a63:eb42:: with SMTP id b2mr21135199pgk.284.1613515677142; Tue, 16 Feb 2021 14:47:57 -0800 (PST) Received: from sc9-mailhost3.vmware.com (c-67-185-44-206.hsd1.wa.comcast.net. [67.185.44.206]) by smtp.gmail.com with ESMTPSA id u17sm168998pgh.72.2021.02.16.14.47.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Feb 2021 14:47:56 -0800 (PST) From: William Tu To: dev@openvswitch.org Date: Tue, 16 Feb 2021 14:47:31 -0800 Message-Id: <1613515651-5501-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH] netdev-linux: Fix indentation. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Remove one extra space. No actual code logic changed. Fixes: 2109841b79845 ("Use batch process recv for tap and raw socket in netdev datapath") Signed-off-by: William Tu --- lib/netdev-linux.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 6be23dbeed57..15b25084b33c 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1255,21 +1255,21 @@ netdev_linux_batch_rxq_recv_sock(struct netdev_rxq_linux *rx, int mtu, * aux_buf is allocated so that it can be prepended to TSO buffer. */ std_len = virtio_net_hdr_size + VLAN_ETH_HEADER_LEN + mtu; for (i = 0; i < NETDEV_MAX_BURST; i++) { - buffers[i] = dp_packet_new_with_headroom(std_len, DP_NETDEV_HEADROOM); - iovs[i][IOV_PACKET].iov_base = dp_packet_data(buffers[i]); - iovs[i][IOV_PACKET].iov_len = std_len; - if (iovlen == IOV_TSO_SIZE) { - iovs[i][IOV_AUXBUF].iov_base = dp_packet_data(rx->aux_bufs[i]); - iovs[i][IOV_AUXBUF].iov_len = dp_packet_tailroom(rx->aux_bufs[i]); - } + buffers[i] = dp_packet_new_with_headroom(std_len, DP_NETDEV_HEADROOM); + iovs[i][IOV_PACKET].iov_base = dp_packet_data(buffers[i]); + iovs[i][IOV_PACKET].iov_len = std_len; + if (iovlen == IOV_TSO_SIZE) { + iovs[i][IOV_AUXBUF].iov_base = dp_packet_data(rx->aux_bufs[i]); + iovs[i][IOV_AUXBUF].iov_len = dp_packet_tailroom(rx->aux_bufs[i]); + } - mmsgs[i].msg_hdr.msg_name = NULL; - mmsgs[i].msg_hdr.msg_namelen = 0; - mmsgs[i].msg_hdr.msg_iov = iovs[i]; - mmsgs[i].msg_hdr.msg_iovlen = iovlen; - mmsgs[i].msg_hdr.msg_control = &cmsg_buffers[i]; - mmsgs[i].msg_hdr.msg_controllen = sizeof cmsg_buffers[i]; - mmsgs[i].msg_hdr.msg_flags = 0; + mmsgs[i].msg_hdr.msg_name = NULL; + mmsgs[i].msg_hdr.msg_namelen = 0; + mmsgs[i].msg_hdr.msg_iov = iovs[i]; + mmsgs[i].msg_hdr.msg_iovlen = iovlen; + mmsgs[i].msg_hdr.msg_control = &cmsg_buffers[i]; + mmsgs[i].msg_hdr.msg_controllen = sizeof cmsg_buffers[i]; + mmsgs[i].msg_hdr.msg_flags = 0; } do {