openvswitch: Move dev pointer into vport itself

This is the first step in representing all OVS vports as regular
struct net_devices. Move the net_device pointer into the vport
structure itself to get rid of struct vport_netdev.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 5 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 02082107c74c..19df28ee5094 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -188,7 +188,7 @@ static int get_dpifindex(const struct datapath *dp)
 
         local = ovs_vport_rcu(dp, OVSP_LOCAL);
         if (local)
-                ifindex = netdev_vport_priv(local)->dev->ifindex;
+                ifindex = local->dev->ifindex;
         else
                 ifindex = 0;
 
@@ -2219,13 +2219,10 @@ static void __net_exit list_vports_from_net(struct net *net, struct net *dnet,
                         struct vport *vport;
 
                         hlist_for_each_entry(vport, &dp->ports[i], dp_hash_node) {
-                                struct netdev_vport *netdev_vport;
-
                                 if (vport->ops->type != OVS_VPORT_TYPE_INTERNAL)
                                         continue;
 
-                                netdev_vport = netdev_vport_priv(vport);
-                                if (dev_net(netdev_vport->dev) == dnet)
+                                if (dev_net(vport->dev) == dnet)
                                         list_add(&vport->detach_list, head);
                         }
                 }