From patchwork Mon Oct 29 04:46:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li,Rongqing via dev" X-Patchwork-Id: 990046 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=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=openvswitch.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b="JNFJycPk"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42k1yJ2zgfz9s3T for ; Mon, 29 Oct 2018 15:36:22 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8F68310A8; Mon, 29 Oct 2018 04:36:19 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id CAE8210A7 for ; Mon, 29 Oct 2018 04:36:17 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4312925A for ; Mon, 29 Oct 2018 04:36:17 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id x12-v6so7109470wrw.8 for ; Sun, 28 Oct 2018 21:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=bwyBZyF4znOd13D8c2MEzHrWPtmJy6sYfgTbsIWOM5M=; b=JNFJycPk5mo2PR8uso/YcjULBLCYKIvwQHAYFFi8Che7aoa0jX2VUS9lqkK1u/UWkO 3z2j/hpJMb4jabCTVG9kQWWRuR/5emXLgfKvJSZ4tuGTF+N1YYXQZsedLeMmsJhHOXp0 u2Upnxm4JGAhu2XUlbAZitb+dYu3NMmOwbyMs= 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=bwyBZyF4znOd13D8c2MEzHrWPtmJy6sYfgTbsIWOM5M=; b=RTYJJbB+WJIQETMEfGlzojk1OMUen5hHUFywoylmByUxgL2TbwBqYxmjoFX7lxY/ZE 7zA/v7Hy2SRvDn0uk2OCdtIMQvXt6bfM9M0EqRHeVfhEaZ7sdO9iqBawq8frnPsKnOcR odqozcvLcRcdEBpPk9mXRhzO7xx52e+lma0BnZmEsV9KwseP2uT2lQIj0gQjjvBAJ5U0 TdH/DP2xRAfPay5EcX1nKumaGOI/mANG1Bx78vl/g2yY0Zh4AoK5IUuTAXdrq/UE/d1P 5SP8XsGfLQFGtHhT25JHQ0rsJe+Ei2Xt9XgWaNc/1XstgtyzGaLn3p32JAnHzeG7gNY2 O7qw== X-Gm-Message-State: AGRZ1gKP5jzHauZFGoMSY2dTcUdsN+950xoscbiNi7iPkTR7XCZYg3Be 02JbM8dWeu007pv11RGHNH2tXCvJ/dLw1w== X-Google-Smtp-Source: AJdET5c7nsqr/Yt52IVx9aCzdGA1VO96xhsF4JcUSrTexi1GhVoEWLdfb0WDtDI6b1SjFI9X1TpEIA== X-Received: by 2002:a5d:5544:: with SMTP id g4-v6mr4546765wrw.222.1540787775424; Sun, 28 Oct 2018 21:36:15 -0700 (PDT) Received: from host-10-123-153-36.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id y21-v6sm2495455wma.36.2018.10.28.21.36.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 21:36:14 -0700 (PDT) To: dev@openvswitch.org Date: Mon, 29 Oct 2018 10:16:45 +0530 Message-Id: <20181029044645.23322-1-sriharsha.basavapatna@broadcom.com> X-Mailer: git-send-email 2.18.0.rc1.1.g6f333ff X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] dpif: Restore a few lines with form feed characters X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Sriharsha Basavapatna via dev From: "Li,Rongqing via dev" Reply-To: Sriharsha Basavapatna MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org A few lines with form feed characters (ASCII: ^L) were accidentally deleted by a recent commit to support rebalancing of offloaded flows. This patch reverts those lines. Fixes: 57924fc91c ("revalidator: Rebalance offloaded flows") Signed-off-by: Sriharsha Basavapatna --- lib/dpif.c | 2 +- lib/dpif.h | 2 +- ofproto/ofproto-dpif-upcall.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dpif.c b/lib/dpif.c index 7f981328e..59aa1dc7c 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -1661,7 +1661,7 @@ dpif_queue_to_priority(const struct dpif *dpif, uint32_t queue_id, log_operation(dpif, "queue_to_priority", error); return error; } - + void dpif_init(struct dpif *dpif, const struct dpif_class *dpif_class, const char *name, diff --git a/lib/dpif.h b/lib/dpif.h index 0df856d4f..475d5a674 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -769,7 +769,7 @@ struct dpif_op { void dpif_operate(struct dpif *, struct dpif_op **ops, size_t n_ops, enum dpif_offload_type); - + /* Upcalls. */ enum dpif_upcall_type { diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c index 28172cb05..e36cfa0ee 100644 --- a/ofproto/ofproto-dpif-upcall.c +++ b/ofproto/ofproto-dpif-upcall.c @@ -1010,7 +1010,7 @@ udpif_revalidator(void *arg) return NULL; } - + static enum upcall_type classify_upcall(enum dpif_upcall_type type, const struct nlattr *userdata, struct user_action_cookie *cookie)