diff options
author | Taehee Yoo <ap420073@gmail.com> | 2019-07-05 12:05:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-07-08 18:53:25 -0400 |
commit | 44e3725943b706d3625ad91b1a1069a18fd0775c (patch) | |
tree | 488738b885a53c51e1cb21ab57207d1959240e32 | |
parent | f714ecc9cf16a63066badbc85bfbfff9af85a8b7 (diff) |
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>
-rw-r--r-- | net/openvswitch/dp_notify.c | 2 | ||||
-rw-r--r-- | 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) | |||
48 | if (vport->ops->type == OVS_VPORT_TYPE_INTERNAL) | 48 | if (vport->ops->type == OVS_VPORT_TYPE_INTERNAL) |
49 | continue; | 49 | continue; |
50 | 50 | ||
51 | if (!(vport->dev->priv_flags & IFF_OVS_DATAPATH)) | 51 | if (!(netif_is_ovs_port(vport->dev))) |
52 | dp_detach_port_notify(vport); | 52 | dp_detach_port_notify(vport); |
53 | } | 53 | } |
54 | } | 54 | } |
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) | |||
156 | static void netdev_destroy(struct vport *vport) | 156 | static void netdev_destroy(struct vport *vport) |
157 | { | 157 | { |
158 | rtnl_lock(); | 158 | rtnl_lock(); |
159 | if (vport->dev->priv_flags & IFF_OVS_DATAPATH) | 159 | if (netif_is_ovs_port(vport->dev)) |
160 | ovs_netdev_detach_dev(vport); | 160 | ovs_netdev_detach_dev(vport); |
161 | rtnl_unlock(); | 161 | rtnl_unlock(); |
162 | 162 | ||
@@ -166,7 +166,7 @@ static void netdev_destroy(struct vport *vport) | |||
166 | void ovs_netdev_tunnel_destroy(struct vport *vport) | 166 | void ovs_netdev_tunnel_destroy(struct vport *vport) |
167 | { | 167 | { |
168 | rtnl_lock(); | 168 | rtnl_lock(); |
169 | if (vport->dev->priv_flags & IFF_OVS_DATAPATH) | 169 | if (netif_is_ovs_port(vport->dev)) |
170 | ovs_netdev_detach_dev(vport); | 170 | ovs_netdev_detach_dev(vport); |
171 | 171 | ||
172 | /* We can be invoked by both explicit vport deletion and | 172 | /* We can be invoked by both explicit vport deletion and |
@@ -186,7 +186,7 @@ EXPORT_SYMBOL_GPL(ovs_netdev_tunnel_destroy); | |||
186 | /* Returns null if this device is not attached to a datapath. */ | 186 | /* Returns null if this device is not attached to a datapath. */ |
187 | struct vport *ovs_netdev_get_vport(struct net_device *dev) | 187 | struct vport *ovs_netdev_get_vport(struct net_device *dev) |
188 | { | 188 | { |
189 | if (likely(dev->priv_flags & IFF_OVS_DATAPATH)) | 189 | if (likely(netif_is_ovs_port(dev))) |
190 | return (struct vport *) | 190 | return (struct vport *) |
191 | rcu_dereference_rtnl(dev->rx_handler_data); | 191 | rcu_dereference_rtnl(dev->rx_handler_data); |
192 | else | 192 | else |