net: openvswitch: use netif_ovs_is_port() instead of opencode

Use netif_ovs_is_port() function instead of open code.
This patch doesn't change logic.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/openvswitch/dp_notify.c b/net/openvswitch/dp_notify.c
index 53cf07d141b41b53e6a41c5ce0fbc410427d54ff..7af0cde8b293c84b98ad1929b9031306b7b03cbe 100644 (file)
--- 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 52a1ed9633ec9b8da8464de1d7c0282b28cb7a09..57d6436e6f6ad44bb34c263ab9f27433d1651b73 100644 (file)
--- 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