From patchwork Fri Jul 5 16:05:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 1128153 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BOtyECsd"; 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 45gKVs57dCz9s7T for ; Sat, 6 Jul 2019 02:06:36 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 61C26E27; Fri, 5 Jul 2019 16:06:34 +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 2D78FDB8 for ; Fri, 5 Jul 2019 16:06:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D9BB770D for ; Fri, 5 Jul 2019 16:06:32 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id t16so4495932pfe.11 for ; Fri, 05 Jul 2019 09:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ce9j80NwzrkR31TIPbEbmPnK/2+x4q195ROBtub58H4=; b=BOtyECsdgq8aZHcjT1+9cPwar/PLRpgL8knQGsfWzWpgjEOWGlbiQ5nRTJyys17SCq aitMcXQGqIeKrC5i7VAfQJz5nGQ5+NglkGD3ITNxEod/S2bBqpayA88SVGL583GruKhr elnEPUBuVpaTJfdVspJh3bymIN1Ri8oP0XgJZly3UFd6cQdnTZQltC+Yc82f4X5qVf0+ qDeAvzZbxNEOILd85iSDv+rrvHyqZrLQleU4C5eSf1O//tkSwzDiabiRWUgF0sVxWkJd l2+rcLq/gl1F6wxg3Jr7DsWH6WaX5hOSJWZr9cdDXw4foD6nBXO0CetddJ92j0RH87sk q0rA== 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=Ce9j80NwzrkR31TIPbEbmPnK/2+x4q195ROBtub58H4=; b=TBbVg36jP/0OhfN2znV9LmPhnbgB+oAf74toO/1gS8eMGU3AVEysQmdtda8+FiRuE4 nWKl6JQIa5cij5+N7MCWN4mWV6M0eroNafIZ4CZqso8blpehu/hwtoY0Bd8ELOhEby5Z /0VbhvZJr8HLKC8JKvgPbmtyeBZVrVp/d1Z+nPvyLBhKsIpunM8RSlGzoC5mnr4WhiKM 9FhvxGy6LeA/SXL3ld7AhszG9EF1qgN7s/RJPQHhyApl23B+CXN/z+EAyWDAzniVL1dV qRwDn7t0aL20owD+0ru0Nm3BNeeiWYKnlIbYCxQ60dWpJFRnwa6ro2Ita3wbaQ60BBwa cLrg== X-Gm-Message-State: APjAAAVMkqErg5CGdYv2oyWfBZX2xXpMWPkr1sQk84t+Kr5J4i1CpXm5 NOMBa9p1QwCpX8qKhrYmG54= X-Google-Smtp-Source: APXvYqx1k4Y6+mboi8AqSryhzenGCJdnTGj331l1JKKcStcCfmEYg23GfLTjFUXLDBMVy7FksAqaPw== X-Received: by 2002:a63:4c19:: with SMTP id z25mr3037293pga.47.1562342792156; Fri, 05 Jul 2019 09:06:32 -0700 (PDT) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([14.33.120.60]) by smtp.gmail.com with ESMTPSA id n140sm9580747pfd.132.2019.07.05.09.06.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Jul 2019 09:06:31 -0700 (PDT) From: Taehee Yoo To: davem@davemloft.net, pshelar@ovn.org, netdev@vger.kernel.org, dev@openvswitch.org Date: Sat, 6 Jul 2019 01:05:46 +0900 Message-Id: <20190705160546.4847-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH net-next] net: openvswitch: use netif_ovs_is_port() instead of opencode 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Use netif_ovs_is_port() function instead of open code. This patch doesn't change logic. Signed-off-by: Taehee Yoo --- net/openvswitch/dp_notify.c | 2 +- net/openvswitch/vport-netdev.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/openvswitch/dp_notify.c b/net/openvswitch/dp_notify.c index 53cf07d141b4..7af0cde8b293 100644 --- a/net/openvswitch/dp_notify.c +++ b/net/openvswitch/dp_notify.c @@ -48,7 +48,7 @@ void ovs_dp_notify_wq(struct work_struct *work) if (vport->ops->type == OVS_VPORT_TYPE_INTERNAL) continue; - if (!(vport->dev->priv_flags & IFF_OVS_DATAPATH)) + if (!(netif_is_ovs_port(vport->dev))) dp_detach_port_notify(vport); } } diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 52a1ed9633ec..57d6436e6f6a 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -156,7 +156,7 @@ void ovs_netdev_detach_dev(struct vport *vport) static void netdev_destroy(struct vport *vport) { rtnl_lock(); - if (vport->dev->priv_flags & IFF_OVS_DATAPATH) + if (netif_is_ovs_port(vport->dev)) ovs_netdev_detach_dev(vport); rtnl_unlock(); @@ -166,7 +166,7 @@ static void netdev_destroy(struct vport *vport) void ovs_netdev_tunnel_destroy(struct vport *vport) { rtnl_lock(); - if (vport->dev->priv_flags & IFF_OVS_DATAPATH) + if (netif_is_ovs_port(vport->dev)) ovs_netdev_detach_dev(vport); /* We can be invoked by both explicit vport deletion and @@ -186,7 +186,7 @@ EXPORT_SYMBOL_GPL(ovs_netdev_tunnel_destroy); /* Returns null if this device is not attached to a datapath. */ struct vport *ovs_netdev_get_vport(struct net_device *dev) { - if (likely(dev->priv_flags & IFF_OVS_DATAPATH)) + if (likely(netif_is_ovs_port(dev))) return (struct vport *) rcu_dereference_rtnl(dev->rx_handler_data); else