tests: Add test suite for packets.h.

[openvswitch] / datapath / vport-internal_dev.c

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index b4dacd0ff501b4413f10567987fc17863326bcc2..1df61801179a0871f46072dbfce71a236f5cf7ce 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -10,10 +10,10 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/rcupdate.h>
 #include <linux/skbuff.h>
 #include <linux/version.h>
 
+#include "checksum.h"
 #include "datapath.h"
 #include "vport-generic.h"
 #include "vport-internal_dev.h"
@@ -71,13 +71,10 @@ static int internal_dev_mac_addr(struct net_device *dev, void *p)
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
-       struct internal_dev *internal_dev = internal_dev_priv(netdev);
-       struct vport *vport = rcu_dereference(internal_dev->vport);
-
        compute_ip_summed(skb, true);
        OVS_CB(skb)->flow = NULL;
 
-       vport_receive(vport, skb);
+       vport_receive(internal_dev_priv(netdev)->vport, skb);
        return 0;
 }
 
@@ -96,10 +93,7 @@ static int internal_dev_stop(struct net_device *netdev)
 static void internal_dev_getinfo(struct net_device *netdev,
                                 struct ethtool_drvinfo *info)
 {
-       struct vport *vport = internal_dev_get_vport(netdev);
-
        strcpy(info->driver, "openvswitch");
-       sprintf(info->bus_info, "%d.%d", vport->dp->dp_idx, vport->port_no);
 }
 
 static const struct ethtool_ops internal_dev_ethtool_ops = {
@@ -196,7 +190,7 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
        }
 
        internal_dev = internal_dev_priv(netdev_vport->dev);
-       rcu_assign_pointer(internal_dev->vport, vport);
+       internal_dev->vport = vport;
 
        err = register_netdevice(netdev_vport->dev);
        if (err)
@@ -222,9 +216,8 @@ static int internal_dev_destroy(struct vport *vport)
        netif_stop_queue(netdev_vport->dev);
        dev_set_promiscuity(netdev_vport->dev, -1);
 
-       synchronize_rcu();
-
        unregister_netdevice(netdev_vport->dev);
+       /* unregister_netdevice() waits for an RCU grace period. */
        vport_free(vport);
 
        return 0;
@@ -253,7 +246,7 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 }
 
 const struct vport_ops internal_vport_ops = {
-       .type           = "internal",
+       .type           = ODP_VPORT_TYPE_INTERNAL,
        .flags          = VPORT_F_REQUIRED | VPORT_F_GEN_STATS | VPORT_F_FLOW,
        .create         = internal_dev_create,
        .destroy        = internal_dev_destroy,
@@ -287,11 +280,8 @@ int is_internal_vport(const struct vport *vport)
 
 struct vport *internal_dev_get_vport(struct net_device *netdev)
 {
-       struct internal_dev *internal_dev;
-
        if (!is_internal_dev(netdev))
                return NULL;
 
-       internal_dev = internal_dev_priv(netdev);
-       return rcu_dereference(internal_dev->vport);
+       return internal_dev_priv(netdev)->vport;
 }