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, 15 insertions, 22 deletions

diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 6a55f7105505..a2c205d9a8d5 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -156,49 +156,44 @@ static void do_setup(struct net_device *netdev)
 static struct vport *internal_dev_create(const struct vport_parms *parms)
 {
         struct vport *vport;
-        struct netdev_vport *netdev_vport;
         struct internal_dev *internal_dev;
         int err;
 
-        vport = ovs_vport_alloc(sizeof(struct netdev_vport),
-                                &ovs_internal_vport_ops, parms);
+        vport = ovs_vport_alloc(0, &ovs_internal_vport_ops, parms);
         if (IS_ERR(vport)) {
                 err = PTR_ERR(vport);
                 goto error;
         }
 
-        netdev_vport = netdev_vport_priv(vport);
-
-        netdev_vport->dev = alloc_netdev(sizeof(struct internal_dev),
-                                         parms->name, NET_NAME_UNKNOWN,
-                                         do_setup);
-        if (!netdev_vport->dev) {
+        vport->dev = alloc_netdev(sizeof(struct internal_dev),
+                                  parms->name, NET_NAME_UNKNOWN, do_setup);
+        if (!vport->dev) {
                 err = -ENOMEM;
                 goto error_free_vport;
         }
 
-        dev_net_set(netdev_vport->dev, ovs_dp_get_net(vport->dp));
-        internal_dev = internal_dev_priv(netdev_vport->dev);
+        dev_net_set(vport->dev, ovs_dp_get_net(vport->dp));
+        internal_dev = internal_dev_priv(vport->dev);
         internal_dev->vport = vport;
 
         /* Restrict bridge port to current netns. */
         if (vport->port_no == OVSP_LOCAL)
-                netdev_vport->dev->features |= NETIF_F_NETNS_LOCAL;
+                vport->dev->features |= NETIF_F_NETNS_LOCAL;
 
         rtnl_lock();
-        err = register_netdevice(netdev_vport->dev);
+        err = register_netdevice(vport->dev);
         if (err)
                 goto error_free_netdev;
 
-        dev_set_promiscuity(netdev_vport->dev, 1);
+        dev_set_promiscuity(vport->dev, 1);
         rtnl_unlock();
-        netif_start_queue(netdev_vport->dev);
+        netif_start_queue(vport->dev);
 
         return vport;
 
 error_free_netdev:
         rtnl_unlock();
-        free_netdev(netdev_vport->dev);
+        free_netdev(vport->dev);
 error_free_vport:
         ovs_vport_free(vport);
 error:
@@ -207,21 +202,19 @@ error:
 
 static void internal_dev_destroy(struct vport *vport)
 {
-        struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-
-        netif_stop_queue(netdev_vport->dev);
+        netif_stop_queue(vport->dev);
         rtnl_lock();
-        dev_set_promiscuity(netdev_vport->dev, -1);
+        dev_set_promiscuity(vport->dev, -1);
 
         /* unregister_netdevice() waits for an RCU grace period. */
-        unregister_netdevice(netdev_vport->dev);
+        unregister_netdevice(vport->dev);
 
         rtnl_unlock();
 }
 
 static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 {
-        struct net_device *netdev = netdev_vport_priv(vport)->dev;
+        struct net_device *netdev = vport->dev;
         int len;
 
         if (unlikely(!(netdev->flags & IFF_UP))) {