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 74a7dfdb236d77b729b4fe0f64e8287637dc508f..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
@@ -93,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 = {
@@ -220,6 +217,7 @@ static int internal_dev_destroy(struct vport *vport)
        dev_set_promiscuity(netdev_vport->dev, -1);
 
        unregister_netdevice(netdev_vport->dev);
+       /* unregister_netdevice() waits for an RCU grace period. */
        vport_free(vport);
 
        return 0;
@@ -248,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,