X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=76c87288a9cd2d30a938b72338760a7f3d8d61c5;hb=85606e05b691be7c2f2d4bcf0e91170b71ec8fbb;hp=e4e7ab132eea510f1dce5a48ca16ada912c2ad7a;hpb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;p=sliver-openvswitch.git

diff --git a/lib/netdev.c b/lib/netdev.c
index e4e7ab132..76c87288a 100644
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 #include <config.h>
 #include "netdev.h"
 
-#include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <netinet/in.h>
@@ -26,6 +25,7 @@
 #include <unistd.h>
 
 #include "coverage.h"
+#include "dpif.h"
 #include "dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
@@ -37,6 +37,7 @@
 #include "packets.h"
 #include "poll-loop.h"
 #include "shash.h"
+#include "smap.h"
 #include "sset.h"
 #include "svec.h"
 #include "vlog.h"
@@ -48,21 +49,24 @@ COVERAGE_DEFINE(netdev_sent);
 COVERAGE_DEFINE(netdev_add_router);
 COVERAGE_DEFINE(netdev_get_stats);
 
+struct netdev_saved_flags {
+    struct netdev *netdev;
+    struct list node;           /* In struct netdev's saved_flags_list. */
+    enum netdev_flags saved_flags;
+    enum netdev_flags saved_values;
+};
+
 static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes);
 
 /* All created network devices. */
-static struct shash netdev_dev_shash = SHASH_INITIALIZER(&netdev_dev_shash);
-
-/* All open network devices. */
-static struct list netdev_list = LIST_INITIALIZER(&netdev_list);
+static struct shash netdev_shash = SHASH_INITIALIZER(&netdev_shash);
 
 /* This is set pretty low because we probably won't learn anything from the
  * additional log messages. */
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
-static void close_all_netdevs(void *aux OVS_UNUSED);
-static int restore_flags(struct netdev *netdev);
-void update_device_args(struct netdev_dev *, const struct shash *args);
+static void restore_all_flags(void *aux OVS_UNUSED);
+void update_device_args(struct netdev *, const struct shash *args);
 
 static void
 netdev_initialize(void)
@@ -72,14 +76,21 @@ netdev_initialize(void)
     if (!inited) {
         inited = true;
 
-        fatal_signal_add_hook(close_all_netdevs, NULL, NULL, true);
+        fatal_signal_add_hook(restore_all_flags, NULL, NULL, true);
+        netdev_vport_patch_register();
 
-#ifdef HAVE_NETLINK
+#ifdef LINUX_DATAPATH
         netdev_register_provider(&netdev_linux_class);
         netdev_register_provider(&netdev_internal_class);
         netdev_register_provider(&netdev_tap_class);
-        netdev_vport_register();
+        netdev_vport_tunnel_register();
+#endif
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+        netdev_register_provider(&netdev_tap_class);
+        netdev_register_provider(&netdev_bsd_class);
 #endif
+	netdev_register_provider(&netdev_tunnel_class);
+	netdev_register_provider(&netdev_pltap_class);
     }
 }
 
@@ -130,7 +141,7 @@ netdev_register_provider(const struct netdev_class *new_class)
         int error = new_class->init();
         if (error) {
             VLOG_ERR("failed to initialize %s network device class: %s",
-                     new_class->type, strerror(error));
+                     new_class->type, ovs_strerror(error));
             return error;
         }
     }
@@ -146,7 +157,7 @@ netdev_register_provider(const struct netdev_class *new_class)
 int
 netdev_unregister_provider(const char *type)
 {
-    struct shash_node *del_node, *netdev_dev_node;
+    struct shash_node *del_node, *netdev_node;
 
     del_node = shash_find(&netdev_classes, type);
     if (!del_node) {
@@ -155,9 +166,9 @@ netdev_unregister_provider(const char *type)
         return EAFNOSUPPORT;
     }
 
-    SHASH_FOR_EACH(netdev_dev_node, &netdev_dev_shash) {
-        struct netdev_dev *netdev_dev = netdev_dev_node->data;
-        if (!strcmp(netdev_dev->netdev_class->type, type)) {
+    SHASH_FOR_EACH (netdev_node, &netdev_shash) {
+        struct netdev *netdev = netdev_node->data;
+        if (!strcmp(netdev->netdev_class->type, type)) {
             VLOG_WARN("attempted to unregister in use netdev provider: %s",
                       type);
             return EBUSY;
@@ -192,6 +203,43 @@ netdev_enumerate_types(struct sset *types)
     }
 }
 
+/* Check that the network device name is not the same as any of the registered
+ * vport providers' dpif_port name (dpif_port is NULL if the vport provider
+ * does not define it) or the datapath internal port name (e.g. ovs-system).
+ *
+ * Returns true if there is a name conflict, false otherwise. */
+bool
+netdev_is_reserved_name(const char *name)
+{
+    struct shash_node *node;
+
+    netdev_initialize();
+    SHASH_FOR_EACH (node, &netdev_classes) {
+        const char *dpif_port;
+        dpif_port = netdev_vport_class_get_dpif_port(node->data);
+        if (dpif_port && !strcmp(dpif_port, name)) {
+            return true;
+        }
+    }
+
+    if (!strncmp(name, "ovs-", 4)) {
+        struct sset types;
+        const char *type;
+
+        sset_init(&types);
+        dp_enumerate_types(&types);
+        SSET_FOR_EACH (type, &types) {
+            if (!strcmp(name+4, type)) {
+                sset_destroy(&types);
+                return true;
+            }
+        }
+        sset_destroy(&types);
+    }
+
+    return false;
+}
+
 /* Opens the network device named 'name' (e.g. "eth0") of the specified 'type'
  * (e.g. "system") and returns zero if successful, otherwise a positive errno
  * value.  On success, sets '*netdevp' to the new network device, otherwise to
@@ -202,15 +250,14 @@ netdev_enumerate_types(struct sset *types)
 int
 netdev_open(const char *name, const char *type, struct netdev **netdevp)
 {
-    struct netdev_dev *netdev_dev;
+    struct netdev *netdev;
     int error;
 
     *netdevp = NULL;
     netdev_initialize();
 
-    netdev_dev = shash_find_data(&netdev_dev_shash, name);
-
-    if (!netdev_dev) {
+    netdev = shash_find_data(&netdev_shash, name);
+    if (!netdev) {
         const struct netdev_class *class;
 
         class = netdev_lookup_provider(type);
@@ -219,39 +266,43 @@ netdev_open(const char *name, const char *type, struct netdev **netdevp)
                       name, type);
             return EAFNOSUPPORT;
         }
-        error = class->create(class, name, &netdev_dev);
+        error = class->create(class, name, &netdev);
         if (error) {
             return error;
         }
-        assert(netdev_dev->netdev_class == class);
+        ovs_assert(netdev->netdev_class == class);
 
     }
+    netdev->ref_cnt++;
 
-    error = netdev_dev->netdev_class->open(netdev_dev, netdevp);
+    *netdevp = netdev;
+    return 0;
+}
 
-    if (!error) {
-        netdev_dev->ref_cnt++;
-    } else {
-        if (!netdev_dev->ref_cnt) {
-            netdev_dev_uninit(netdev_dev, true);
-        }
-    }
+/* Returns a reference to 'netdev_' for the caller to own. Returns null if
+ * 'netdev_' is null. */
+struct netdev *
+netdev_ref(const struct netdev *netdev_)
+{
+    struct netdev *netdev = CONST_CAST(struct netdev *, netdev_);
 
-    return error;
+    if (netdev) {
+        ovs_assert(netdev->ref_cnt > 0);
+        netdev->ref_cnt++;
+    }
+    return netdev;
 }
 
 /* Reconfigures the device 'netdev' with 'args'.  'args' may be empty
  * or NULL if none are needed. */
 int
-netdev_set_config(struct netdev *netdev, const struct shash *args)
+netdev_set_config(struct netdev *netdev, const struct smap *args)
 {
-    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-
-    if (netdev_dev->netdev_class->set_config) {
-        struct shash no_args = SHASH_INITIALIZER(&no_args);
-        return netdev_dev->netdev_class->set_config(netdev_dev,
-                                                    args ? args : &no_args);
-    } else if (args && !shash_is_empty(args)) {
+    if (netdev->netdev_class->set_config) {
+        struct smap no_args = SMAP_INITIALIZER(&no_args);
+        return netdev->netdev_class->set_config(netdev,
+                                                args ? args : &no_args);
+    } else if (args && !smap_is_empty(args)) {
         VLOG_WARN("%s: arguments provided to device that is not configurable",
                   netdev_get_name(netdev));
     }
@@ -260,23 +311,22 @@ netdev_set_config(struct netdev *netdev, const struct shash *args)
 }
 
 /* Returns the current configuration for 'netdev' in 'args'.  The caller must
- * have already initialized 'args' with shash_init().  Returns 0 on success, in
+ * have already initialized 'args' with smap_init().  Returns 0 on success, in
  * which case 'args' will be filled with 'netdev''s configuration.  On failure
  * returns a positive errno value, in which case 'args' will be empty.
  *
  * The caller owns 'args' and its contents and must eventually free them with
- * shash_destroy_free_data(). */
+ * smap_destroy(). */
 int
-netdev_get_config(const struct netdev *netdev, struct shash *args)
+netdev_get_config(const struct netdev *netdev, struct smap *args)
 {
-    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
     int error;
 
-    shash_clear_free_data(args);
-    if (netdev_dev->netdev_class->get_config) {
-        error = netdev_dev->netdev_class->get_config(netdev_dev, args);
+    smap_clear(args);
+    if (netdev->netdev_class->get_config) {
+        error = netdev->netdev_class->get_config(netdev, args);
         if (error) {
-            shash_clear_free_data(args);
+            smap_clear(args);
         }
     } else {
         error = 0;
@@ -285,51 +335,32 @@ netdev_get_config(const struct netdev *netdev, struct shash *args)
     return error;
 }
 
-/* Closes and destroys 'netdev'. */
-void
-netdev_close(struct netdev *netdev)
+const struct netdev_tunnel_config *
+netdev_get_tunnel_config(const struct netdev *netdev)
 {
-    if (netdev) {
-        struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-
-        assert(netdev_dev->ref_cnt);
-        netdev_dev->ref_cnt--;
-        netdev_uninit(netdev, true);
-
-        /* If the reference count for the netdev device is zero, destroy it. */
-        if (!netdev_dev->ref_cnt) {
-            netdev_dev_uninit(netdev_dev, true);
-        }
+    if (netdev->netdev_class->get_tunnel_config) {
+        return netdev->netdev_class->get_tunnel_config(netdev);
+    } else {
+        return NULL;
     }
 }
 
-/* Returns true if a network device named 'name' exists and may be opened,
- * otherwise false. */
-bool
-netdev_exists(const char *name)
+static void
+netdev_unref(struct netdev *dev)
 {
-    struct netdev *netdev;
-    int error;
-
-    error = netdev_open(name, "system", &netdev);
-    if (!error) {
-        netdev_close(netdev);
-        return true;
-    } else {
-        if (error != ENODEV) {
-            VLOG_WARN("failed to open network device %s: %s",
-                      name, strerror(error));
-        }
-        return false;
+    ovs_assert(dev->ref_cnt);
+    if (!--dev->ref_cnt) {
+        netdev_uninit(dev, true);
     }
 }
 
-/* Returns true if a network device named 'name' is currently opened,
- * otherwise false. */
-bool
-netdev_is_open(const char *name)
+/* Closes and destroys 'netdev'. */
+void
+netdev_close(struct netdev *netdev)
 {
-    return !!shash_find_data(&netdev_dev_shash, name);
+    if (netdev) {
+        netdev_unref(netdev);
+    }
 }
 
 /* Parses 'netdev_name_', which is of the form [type@]name into its component
@@ -351,49 +382,43 @@ netdev_parse_name(const char *netdev_name_, char **name, char **type)
     }
 }
 
-/* Attempts to set up 'netdev' for receiving packets with netdev_recv().
- * Returns 0 if successful, otherwise a positive errno value.  EOPNOTSUPP
- * indicates that the network device does not implement packet reception
- * through this interface. */
 int
-netdev_listen(struct netdev *netdev)
+netdev_rx_open(struct netdev *netdev, struct netdev_rx **rxp)
 {
-    int (*listen)(struct netdev *);
+    int error;
 
-    listen = netdev_get_dev(netdev)->netdev_class->listen;
-    return listen ? (listen)(netdev) : EOPNOTSUPP;
+    error = (netdev->netdev_class->rx_open
+             ? netdev->netdev_class->rx_open(netdev, rxp)
+             : EOPNOTSUPP);
+    if (!error) {
+        ovs_assert((*rxp)->netdev == netdev);
+        netdev->ref_cnt++;
+    } else {
+        *rxp = NULL;
+    }
+    return error;
+}
+
+void
+netdev_rx_close(struct netdev_rx *rx)
+{
+    if (rx) {
+        struct netdev *dev = rx->netdev;
+
+        rx->rx_class->destroy(rx);
+        netdev_unref(dev);
+    }
 }
 
-/* Attempts to receive a packet from 'netdev' into 'buffer', which the caller
- * must have initialized with sufficient room for the packet.  The space
- * required to receive any packet is ETH_HEADER_LEN bytes, plus VLAN_HEADER_LEN
- * bytes, plus the device's MTU (which may be retrieved via netdev_get_mtu()).
- * (Some devices do not allow for a VLAN header, in which case VLAN_HEADER_LEN
- * need not be included.)
- *
- * This function can only be expected to return a packet if ->listen() has
- * been called successfully.
- *
- * If a packet is successfully retrieved, returns 0.  In this case 'buffer' is
- * guaranteed to contain at least ETH_TOTAL_MIN bytes.  Otherwise, returns a
- * positive errno value.  Returns EAGAIN immediately if no packet is ready to
- * be returned.
- *
- * Some network devices may not implement support for this function.  In such
- * cases this function will always return EOPNOTSUPP. */
 int
-netdev_recv(struct netdev *netdev, struct ofpbuf *buffer)
+netdev_rx_recv(struct netdev_rx *rx, struct ofpbuf *buffer)
 {
-    int (*recv)(struct netdev *, void *, size_t);
     int retval;
 
-    assert(buffer->size == 0);
-    assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN);
+    ovs_assert(buffer->size == 0);
+    ovs_assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN);
 
-    recv = netdev_get_dev(netdev)->netdev_class->recv;
-    retval = (recv
-              ? (recv)(netdev, buffer->data, ofpbuf_tailroom(buffer))
-              : -EOPNOTSUPP);
+    retval = rx->rx_class->recv(rx, buffer->data, ofpbuf_tailroom(buffer));
     if (retval >= 0) {
         COVERAGE_INC(netdev_received);
         buffer->size += retval;
@@ -406,27 +431,16 @@ netdev_recv(struct netdev *netdev, struct ofpbuf *buffer)
     }
 }
 
-/* Registers with the poll loop to wake up from the next call to poll_block()
- * when a packet is ready to be received with netdev_recv() on 'netdev'. */
 void
-netdev_recv_wait(struct netdev *netdev)
+netdev_rx_wait(struct netdev_rx *rx)
 {
-    void (*recv_wait)(struct netdev *);
-
-    recv_wait = netdev_get_dev(netdev)->netdev_class->recv_wait;
-    if (recv_wait) {
-        recv_wait(netdev);
-    }
+    rx->rx_class->wait(rx);
 }
 
-/* Discards all packets waiting to be received from 'netdev'. */
 int
-netdev_drain(struct netdev *netdev)
+netdev_rx_drain(struct netdev_rx *rx)
 {
-    int (*drain)(struct netdev *);
-
-    drain = netdev_get_dev(netdev)->netdev_class->drain;
-    return drain ? drain(netdev) : 0;
+    return rx->rx_class->drain ? rx->rx_class->drain(rx) : 0;
 }
 
 /* Sends 'buffer' on 'netdev'.  Returns 0 if successful, otherwise a positive
@@ -444,11 +458,11 @@ netdev_drain(struct netdev *netdev)
 int
 netdev_send(struct netdev *netdev, const struct ofpbuf *buffer)
 {
-    int (*send)(struct netdev *, const void *, size_t);
     int error;
 
-    send = netdev_get_dev(netdev)->netdev_class->send;
-    error = send ? (send)(netdev, buffer->data, buffer->size) : EOPNOTSUPP;
+    error = (netdev->netdev_class->send
+             ? netdev->netdev_class->send(netdev, buffer->data, buffer->size)
+             : EOPNOTSUPP);
     if (!error) {
         COVERAGE_INC(netdev_sent);
     }
@@ -465,11 +479,8 @@ netdev_send(struct netdev *netdev, const struct ofpbuf *buffer)
 void
 netdev_send_wait(struct netdev *netdev)
 {
-    void (*send_wait)(struct netdev *);
-
-    send_wait = netdev_get_dev(netdev)->netdev_class->send_wait;
-    if (send_wait) {
-        send_wait(netdev);
+    if (netdev->netdev_class->send_wait) {
+        netdev->netdev_class->send_wait(netdev);
     }
 }
 
@@ -478,7 +489,7 @@ netdev_send_wait(struct netdev *netdev)
 int
 netdev_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN])
 {
-    return netdev_get_dev(netdev)->netdev_class->set_etheraddr(netdev, mac);
+    return netdev->netdev_class->set_etheraddr(netdev, mac);
 }
 
 /* Retrieves 'netdev''s MAC address.  If successful, returns 0 and copies the
@@ -487,7 +498,7 @@ netdev_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN])
 int
 netdev_get_etheraddr(const struct netdev *netdev, uint8_t mac[ETH_ADDR_LEN])
 {
-    return netdev_get_dev(netdev)->netdev_class->get_etheraddr(netdev, mac);
+    return netdev->netdev_class->get_etheraddr(netdev, mac);
 }
 
 /* Returns the name of the network device that 'netdev' represents,
@@ -495,7 +506,7 @@ netdev_get_etheraddr(const struct netdev *netdev, uint8_t mac[ETH_ADDR_LEN])
 const char *
 netdev_get_name(const struct netdev *netdev)
 {
-    return netdev_get_dev(netdev)->name;
+    return netdev->name;
 }
 
 /* Retrieves the MTU of 'netdev'.  The MTU is the maximum size of transmitted
@@ -509,7 +520,7 @@ netdev_get_name(const struct netdev *netdev)
 int
 netdev_get_mtu(const struct netdev *netdev, int *mtup)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     int error;
 
     error = class->get_mtu ? class->get_mtu(netdev, mtup) : EOPNOTSUPP;
@@ -517,7 +528,7 @@ netdev_get_mtu(const struct netdev *netdev, int *mtup)
         *mtup = 0;
         if (error != EOPNOTSUPP) {
             VLOG_DBG_RL(&rl, "failed to retrieve MTU for network device %s: "
-                         "%s", netdev_get_name(netdev), strerror(error));
+                         "%s", netdev_get_name(netdev), ovs_strerror(error));
         }
     }
     return error;
@@ -532,13 +543,13 @@ netdev_get_mtu(const struct netdev *netdev, int *mtup)
 int
 netdev_set_mtu(const struct netdev *netdev, int mtu)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     int error;
 
     error = class->set_mtu ? class->set_mtu(netdev, mtu) : EOPNOTSUPP;
     if (error && error != EOPNOTSUPP) {
         VLOG_DBG_RL(&rl, "failed to set MTU for network device %s: %s",
-                     netdev_get_name(netdev), strerror(error));
+                     netdev_get_name(netdev), ovs_strerror(error));
     }
 
     return error;
@@ -561,7 +572,7 @@ netdev_get_ifindex(const struct netdev *netdev)
 {
     int (*get_ifindex)(const struct netdev *);
 
-    get_ifindex = netdev_get_dev(netdev)->netdev_class->get_ifindex;
+    get_ifindex = netdev->netdev_class->get_ifindex;
 
     return get_ifindex ? get_ifindex(netdev) : -EOPNOTSUPP;
 }
@@ -602,7 +613,7 @@ netdev_get_features(const struct netdev *netdev,
         peer = &dummy[3];
     }
 
-    get_features = netdev_get_dev(netdev)->netdev_class->get_features;
+    get_features = netdev->netdev_class->get_features;
     error = get_features
                     ? get_features(netdev, current, advertised, supported,
                                    peer)
@@ -615,9 +626,10 @@ netdev_get_features(const struct netdev *netdev,
 
 /* Returns the maximum speed of a network connection that has the NETDEV_F_*
  * bits in 'features', in bits per second.  If no bits that indicate a speed
- * are set in 'features', assumes 100Mbps. */
+ * are set in 'features', returns 'default_bps'. */
 uint64_t
-netdev_features_to_bps(enum netdev_features features)
+netdev_features_to_bps(enum netdev_features features,
+                       uint64_t default_bps)
 {
     enum {
         F_1000000MB = NETDEV_F_1TB_FD,
@@ -636,7 +648,7 @@ netdev_features_to_bps(enum netdev_features features)
             : features & F_1000MB    ? UINT64_C(1000000000)
             : features & F_100MB     ? UINT64_C(100000000)
             : features & F_10MB      ? UINT64_C(10000000)
-                                     : UINT64_C(100000000));
+                                     : default_bps);
 }
 
 /* Returns true if any of the NETDEV_F_* bits that indicate a full-duplex link
@@ -655,8 +667,8 @@ int
 netdev_set_advertisements(struct netdev *netdev,
                           enum netdev_features advertise)
 {
-    return (netdev_get_dev(netdev)->netdev_class->set_advertisements
-            ? netdev_get_dev(netdev)->netdev_class->set_advertisements(
+    return (netdev->netdev_class->set_advertisements
+            ? netdev->netdev_class->set_advertisements(
                     netdev, advertise)
             : EOPNOTSUPP);
 }
@@ -681,8 +693,8 @@ netdev_get_in4(const struct netdev *netdev,
     struct in_addr netmask;
     int error;
 
-    error = (netdev_get_dev(netdev)->netdev_class->get_in4
-             ? netdev_get_dev(netdev)->netdev_class->get_in4(netdev,
+    error = (netdev->netdev_class->get_in4
+             ? netdev->netdev_class->get_in4(netdev,
                     &address, &netmask)
              : EOPNOTSUPP);
     if (address_) {
@@ -700,8 +712,8 @@ netdev_get_in4(const struct netdev *netdev,
 int
 netdev_set_in4(struct netdev *netdev, struct in_addr addr, struct in_addr mask)
 {
-    return (netdev_get_dev(netdev)->netdev_class->set_in4
-            ? netdev_get_dev(netdev)->netdev_class->set_in4(netdev, addr, mask)
+    return (netdev->netdev_class->set_in4
+            ? netdev->netdev_class->set_in4(netdev, addr, mask)
             : EOPNOTSUPP);
 }
 
@@ -731,8 +743,8 @@ int
 netdev_add_router(struct netdev *netdev, struct in_addr router)
 {
     COVERAGE_INC(netdev_add_router);
-    return (netdev_get_dev(netdev)->netdev_class->add_router
-            ? netdev_get_dev(netdev)->netdev_class->add_router(netdev, router)
+    return (netdev->netdev_class->add_router
+            ? netdev->netdev_class->add_router(netdev, router)
             : EOPNOTSUPP);
 }
 
@@ -748,8 +760,8 @@ netdev_get_next_hop(const struct netdev *netdev,
                     const struct in_addr *host, struct in_addr *next_hop,
                     char **netdev_name)
 {
-    int error = (netdev_get_dev(netdev)->netdev_class->get_next_hop
-                 ? netdev_get_dev(netdev)->netdev_class->get_next_hop(
+    int error = (netdev->netdev_class->get_next_hop
+                 ? netdev->netdev_class->get_next_hop(
                         host, next_hop, netdev_name)
                  : EOPNOTSUPP);
     if (error) {
@@ -759,18 +771,16 @@ netdev_get_next_hop(const struct netdev *netdev,
     return error;
 }
 
-/* Populates 'sh' with status information.
+/* Populates 'smap' with status information.
  *
- * Populates 'sh' with 'netdev' specific status information.  This information
- * may be used to populate the status column of the Interface table as defined
- * in ovs-vswitchd.conf.db(5). */
+ * Populates 'smap' with 'netdev' specific status information.  This
+ * information may be used to populate the status column of the Interface table
+ * as defined in ovs-vswitchd.conf.db(5). */
 int
-netdev_get_drv_info(const struct netdev *netdev, struct shash *sh)
+netdev_get_status(const struct netdev *netdev, struct smap *smap)
 {
-    struct netdev_dev *dev = netdev_get_dev(netdev);
-
-    return (dev->netdev_class->get_drv_info
-            ? dev->netdev_class->get_drv_info(netdev, sh)
+    return (netdev->netdev_class->get_status
+            ? netdev->netdev_class->get_status(netdev, smap)
             : EOPNOTSUPP);
 }
 
@@ -791,8 +801,8 @@ netdev_get_in6(const struct netdev *netdev, struct in6_addr *in6)
     struct in6_addr dummy;
     int error;
 
-    error = (netdev_get_dev(netdev)->netdev_class->get_in6
-             ? netdev_get_dev(netdev)->netdev_class->get_in6(netdev,
+    error = (netdev->netdev_class->get_in6
+             ? netdev->netdev_class->get_in6(netdev,
                     in6 ? in6 : &dummy)
              : EOPNOTSUPP);
     if (error && in6) {
@@ -802,37 +812,44 @@ netdev_get_in6(const struct netdev *netdev, struct in6_addr *in6)
 }
 
 /* On 'netdev', turns off the flags in 'off' and then turns on the flags in
- * 'on'.  If 'permanent' is true, the changes will persist; otherwise, they
- * will be reverted when 'netdev' is closed or the program exits.  Returns 0 if
- * successful, otherwise a positive errno value. */
+ * 'on'.  Returns 0 if successful, otherwise a positive errno value. */
 static int
 do_update_flags(struct netdev *netdev, enum netdev_flags off,
                 enum netdev_flags on, enum netdev_flags *old_flagsp,
-                bool permanent)
+                struct netdev_saved_flags **sfp)
 {
+    struct netdev_saved_flags *sf = NULL;
     enum netdev_flags old_flags;
     int error;
 
-    error = netdev_get_dev(netdev)->netdev_class->update_flags(netdev,
-                off & ~on, on, &old_flags);
+    error = netdev->netdev_class->update_flags(netdev, off & ~on, on,
+                                               &old_flags);
     if (error) {
         VLOG_WARN_RL(&rl, "failed to %s flags for network device %s: %s",
                      off || on ? "set" : "get", netdev_get_name(netdev),
-                     strerror(error));
+                     ovs_strerror(error));
         old_flags = 0;
-    } else if ((off || on) && !permanent) {
+    } else if ((off || on) && sfp) {
         enum netdev_flags new_flags = (old_flags & ~off) | on;
         enum netdev_flags changed_flags = old_flags ^ new_flags;
         if (changed_flags) {
-            if (!netdev->changed_flags) {
-                netdev->save_flags = old_flags;
-            }
-            netdev->changed_flags |= changed_flags;
+            *sfp = sf = xmalloc(sizeof *sf);
+            sf->netdev = netdev;
+            list_push_front(&netdev->saved_flags_list, &sf->node);
+            sf->saved_flags = changed_flags;
+            sf->saved_values = changed_flags & new_flags;
+
+            netdev->ref_cnt++;
         }
     }
+
     if (old_flagsp) {
         *old_flagsp = old_flags;
     }
+    if (sfp) {
+        *sfp = sf;
+    }
+
     return error;
 }
 
@@ -842,41 +859,64 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off,
 int
 netdev_get_flags(const struct netdev *netdev_, enum netdev_flags *flagsp)
 {
-    struct netdev *netdev = (struct netdev *) netdev_;
-    return do_update_flags(netdev, 0, 0, flagsp, false);
+    struct netdev *netdev = CONST_CAST(struct netdev *, netdev_);
+    return do_update_flags(netdev, 0, 0, flagsp, NULL);
 }
 
 /* Sets the flags for 'netdev' to 'flags'.
- * If 'permanent' is true, the changes will persist; otherwise, they
- * will be reverted when 'netdev' is closed or the program exits.
  * Returns 0 if successful, otherwise a positive errno value. */
 int
 netdev_set_flags(struct netdev *netdev, enum netdev_flags flags,
-                 bool permanent)
+                 struct netdev_saved_flags **sfp)
 {
-    return do_update_flags(netdev, -1, flags, NULL, permanent);
+    return do_update_flags(netdev, -1, flags, NULL, sfp);
 }
 
-/* Turns on the specified 'flags' on 'netdev'.
- * If 'permanent' is true, the changes will persist; otherwise, they
- * will be reverted when 'netdev' is closed or the program exits.
- * Returns 0 if successful, otherwise a positive errno value. */
+/* Turns on the specified 'flags' on 'netdev':
+ *
+ *    - On success, returns 0.  If 'sfp' is nonnull, sets '*sfp' to a newly
+ *      allocated 'struct netdev_saved_flags *' that may be passed to
+ *      netdev_restore_flags() to restore the original values of 'flags' on
+ *      'netdev' (this will happen automatically at program termination if
+ *      netdev_restore_flags() is never called) , or to NULL if no flags were
+ *      actually changed.
+ *
+ *    - On failure, returns a positive errno value.  If 'sfp' is nonnull, sets
+ *      '*sfp' to NULL. */
 int
 netdev_turn_flags_on(struct netdev *netdev, enum netdev_flags flags,
-                     bool permanent)
+                     struct netdev_saved_flags **sfp)
 {
-    return do_update_flags(netdev, 0, flags, NULL, permanent);
+    return do_update_flags(netdev, 0, flags, NULL, sfp);
 }
 
-/* Turns off the specified 'flags' on 'netdev'.
- * If 'permanent' is true, the changes will persist; otherwise, they
- * will be reverted when 'netdev' is closed or the program exits.
- * Returns 0 if successful, otherwise a positive errno value. */
+/* Turns off the specified 'flags' on 'netdev'.  See netdev_turn_flags_on() for
+ * details of the interface. */
 int
 netdev_turn_flags_off(struct netdev *netdev, enum netdev_flags flags,
-                      bool permanent)
+                      struct netdev_saved_flags **sfp)
 {
-    return do_update_flags(netdev, flags, 0, NULL, permanent);
+    return do_update_flags(netdev, flags, 0, NULL, sfp);
+}
+
+/* Restores the flags that were saved in 'sf', and destroys 'sf'.
+ * Does nothing if 'sf' is NULL. */
+void
+netdev_restore_flags(struct netdev_saved_flags *sf)
+{
+    if (sf) {
+        struct netdev *netdev = sf->netdev;
+        enum netdev_flags old_flags;
+
+        netdev->netdev_class->update_flags(netdev,
+                                           sf->saved_flags & sf->saved_values,
+                                           sf->saved_flags & ~sf->saved_values,
+                                           &old_flags);
+        list_remove(&sf->node);
+        free(sf);
+
+        netdev_unref(netdev);
+    }
 }
 
 /* Looks up the ARP table entry for 'ip' on 'netdev'.  If one exists and can be
@@ -887,8 +927,8 @@ int
 netdev_arp_lookup(const struct netdev *netdev,
                   ovs_be32 ip, uint8_t mac[ETH_ADDR_LEN])
 {
-    int error = (netdev_get_dev(netdev)->netdev_class->arp_lookup
-                 ? netdev_get_dev(netdev)->netdev_class->arp_lookup(netdev,
+    int error = (netdev->netdev_class->arp_lookup
+                 ? netdev->netdev_class->arp_lookup(netdev,
                         ip, mac)
                  : EOPNOTSUPP);
     if (error) {
@@ -910,15 +950,15 @@ netdev_get_carrier(const struct netdev *netdev)
         return false;
     }
 
-    if (!netdev_get_dev(netdev)->netdev_class->get_carrier) {
+    if (!netdev->netdev_class->get_carrier) {
         return true;
     }
 
-    error = netdev_get_dev(netdev)->netdev_class->get_carrier(netdev,
+    error = netdev->netdev_class->get_carrier(netdev,
                                                               &carrier);
     if (error) {
         VLOG_DBG("%s: failed to get network device carrier status, assuming "
-                 "down: %s", netdev_get_name(netdev), strerror(error));
+                 "down: %s", netdev_get_name(netdev), ovs_strerror(error));
         carrier = false;
     }
 
@@ -929,8 +969,8 @@ netdev_get_carrier(const struct netdev *netdev)
 long long int
 netdev_get_carrier_resets(const struct netdev *netdev)
 {
-    return (netdev_get_dev(netdev)->netdev_class->get_carrier_resets
-            ? netdev_get_dev(netdev)->netdev_class->get_carrier_resets(netdev)
+    return (netdev->netdev_class->get_carrier_resets
+            ? netdev->netdev_class->get_carrier_resets(netdev)
             : 0);
 }
 
@@ -945,9 +985,8 @@ netdev_get_carrier_resets(const struct netdev *netdev)
 int
 netdev_set_miimon_interval(struct netdev *netdev, long long int interval)
 {
-    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-    return (netdev_dev->netdev_class->set_miimon_interval
-            ? netdev_dev->netdev_class->set_miimon_interval(netdev, interval)
+    return (netdev->netdev_class->set_miimon_interval
+            ? netdev->netdev_class->set_miimon_interval(netdev, interval)
             : EOPNOTSUPP);
 }
 
@@ -958,8 +997,8 @@ netdev_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
     int error;
 
     COVERAGE_INC(netdev_get_stats);
-    error = (netdev_get_dev(netdev)->netdev_class->get_stats
-             ? netdev_get_dev(netdev)->netdev_class->get_stats(netdev, stats)
+    error = (netdev->netdev_class->get_stats
+             ? netdev->netdev_class->get_stats(netdev, stats)
              : EOPNOTSUPP);
     if (error) {
         memset(stats, 0xff, sizeof *stats);
@@ -975,8 +1014,8 @@ netdev_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
 int
 netdev_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
 {
-    return (netdev_get_dev(netdev)->netdev_class->set_stats
-             ? netdev_get_dev(netdev)->netdev_class->set_stats(netdev, stats)
+    return (netdev->netdev_class->set_stats
+             ? netdev->netdev_class->set_stats(netdev, stats)
              : EOPNOTSUPP);
 }
 
@@ -987,8 +1026,8 @@ int
 netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate,
                     uint32_t kbits_burst)
 {
-    return (netdev_get_dev(netdev)->netdev_class->set_policing
-            ? netdev_get_dev(netdev)->netdev_class->set_policing(netdev,
+    return (netdev->netdev_class->set_policing
+            ? netdev->netdev_class->set_policing(netdev,
                     kbits_rate, kbits_burst)
             : EOPNOTSUPP);
 }
@@ -1009,7 +1048,7 @@ netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate,
 int
 netdev_get_qos_types(const struct netdev *netdev, struct sset *types)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     return (class->get_qos_types
             ? class->get_qos_types(netdev, types)
             : 0);
@@ -1024,7 +1063,7 @@ int
 netdev_get_qos_capabilities(const struct netdev *netdev, const char *type,
                             struct netdev_qos_capabilities *caps)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
 
     if (*type) {
         int retval = (class->get_qos_capabilities
@@ -1065,10 +1104,9 @@ netdev_get_n_queues(const struct netdev *netdev,
  *
  * A '*typep' of "" indicates that QoS is currently disabled on 'netdev'.
  *
- * The caller must initialize 'details' as an empty shash (e.g. with
- * shash_init()) before calling this function.  The caller must free 'details',
- * including 'data' members, when it is no longer needed (e.g. with
- * shash_destroy_free_data()).
+ * The caller must initialize 'details' as an empty smap (e.g. with
+ * smap_init()) before calling this function.  The caller must free 'details'
+ * when it is no longer needed (e.g. with smap_destroy()).
  *
  * The caller must not modify or free '*typep'.
  *
@@ -1078,16 +1116,16 @@ netdev_get_n_queues(const struct netdev *netdev,
  * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). */
 int
 netdev_get_qos(const struct netdev *netdev,
-               const char **typep, struct shash *details)
+               const char **typep, struct smap *details)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     int retval;
 
     if (class->get_qos) {
         retval = class->get_qos(netdev, typep, details);
         if (retval) {
             *typep = NULL;
-            shash_clear_free_data(details);
+            smap_clear(details);
         }
         return retval;
     } else {
@@ -1117,9 +1155,9 @@ netdev_get_qos(const struct netdev *netdev,
  * details. */
 int
 netdev_set_qos(struct netdev *netdev,
-               const char *type, const struct shash *details)
+               const char *type, const struct smap *details)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
 
     if (!type) {
         type = "";
@@ -1127,7 +1165,7 @@ netdev_set_qos(struct netdev *netdev,
 
     if (class->set_qos) {
         if (!details) {
-            static struct shash empty = SHASH_INITIALIZER(&empty);
+            static const struct smap empty = SMAP_INITIALIZER(&empty);
             details = &empty;
         }
         return class->set_qos(netdev, type, details);
@@ -1147,21 +1185,21 @@ netdev_set_qos(struct netdev *netdev,
  * given 'type' in the "other_config" column in the "Queue" table in
  * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)).
  *
- * The caller must initialize 'details' (e.g. with shash_init()) before calling
- * this function.  The caller must free 'details', including 'data' members,
- * when it is no longer needed (e.g. with shash_destroy_free_data()). */
+ * The caller must initialize 'details' (e.g. with smap_init()) before calling
+ * this function.  The caller must free 'details' when it is no longer needed
+ * (e.g. with smap_destroy()). */
 int
 netdev_get_queue(const struct netdev *netdev,
-                 unsigned int queue_id, struct shash *details)
+                 unsigned int queue_id, struct smap *details)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     int retval;
 
     retval = (class->get_queue
               ? class->get_queue(netdev, queue_id, details)
               : EOPNOTSUPP);
     if (retval) {
-        shash_clear_free_data(details);
+        smap_clear(details);
     }
     return retval;
 }
@@ -1180,9 +1218,9 @@ netdev_get_queue(const struct netdev *netdev,
  * it. */
 int
 netdev_set_queue(struct netdev *netdev,
-                 unsigned int queue_id, const struct shash *details)
+                 unsigned int queue_id, const struct smap *details)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     return (class->set_queue
             ? class->set_queue(netdev, queue_id, details)
             : EOPNOTSUPP);
@@ -1201,7 +1239,7 @@ netdev_set_queue(struct netdev *netdev,
 int
 netdev_delete_queue(struct netdev *netdev, unsigned int queue_id)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     return (class->delete_queue
             ? class->delete_queue(netdev, queue_id)
             : EOPNOTSUPP);
@@ -1215,7 +1253,7 @@ int
 netdev_get_queue_stats(const struct netdev *netdev, unsigned int queue_id,
                        struct netdev_queue_stats *stats)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     int retval;
 
     retval = (class->get_queue_stats
@@ -1247,7 +1285,7 @@ int
 netdev_dump_queues(const struct netdev *netdev,
                    netdev_dump_queues_cb *cb, void *aux)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     return (class->dump_queues
             ? class->dump_queues(netdev, cb, aux)
             : EOPNOTSUPP);
@@ -1269,7 +1307,7 @@ int
 netdev_dump_queue_stats(const struct netdev *netdev,
                         netdev_dump_queue_stats_cb *cb, void *aux)
 {
-    const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+    const struct netdev_class *class = netdev->netdev_class;
     return (class->dump_queue_stats
             ? class->dump_queue_stats(netdev, cb, aux)
             : EOPNOTSUPP);
@@ -1285,26 +1323,26 @@ netdev_dump_queue_stats(const struct netdev *netdev,
 unsigned int
 netdev_change_seq(const struct netdev *netdev)
 {
-    return netdev_get_dev(netdev)->netdev_class->change_seq(netdev);
+    return netdev->netdev_class->change_seq(netdev);
 }
 
-/* Initializes 'netdev_dev' as a netdev device named 'name' of the specified
+/* Initializes 'netdev' as a netdev device named 'name' of the specified
  * 'netdev_class'.  This function is ordinarily called from a netdev provider's
  * 'create' function.
  *
- * This function adds 'netdev_dev' to a netdev-owned shash, so it is
- * very important that 'netdev_dev' only be freed after calling
- * the refcount drops to zero.  */
+ * This function adds 'netdev' to a netdev-owned shash, so it is very important
+ * that 'netdev' only be freed after calling netdev_uninit().  */
 void
-netdev_dev_init(struct netdev_dev *netdev_dev, const char *name,
-                const struct netdev_class *netdev_class)
+netdev_init(struct netdev *netdev, const char *name,
+            const struct netdev_class *netdev_class)
 {
-    assert(!shash_find(&netdev_dev_shash, name));
+    ovs_assert(!shash_find(&netdev_shash, name));
 
-    memset(netdev_dev, 0, sizeof *netdev_dev);
-    netdev_dev->netdev_class = netdev_class;
-    netdev_dev->name = xstrdup(name);
-    netdev_dev->node = shash_add(&netdev_dev_shash, name, netdev_dev);
+    memset(netdev, 0, sizeof *netdev);
+    netdev->netdev_class = netdev_class;
+    netdev->name = xstrdup(name);
+    netdev->node = shash_add(&netdev_shash, name, netdev);
+    list_init(&netdev->saved_flags_list);
 }
 
 /* Undoes the results of initialization.
@@ -1315,65 +1353,57 @@ netdev_dev_init(struct netdev_dev *netdev_dev, const char *name,
  * that occurs after initialization.  It this case netdev_close() would
  * never be called. */
 void
-netdev_dev_uninit(struct netdev_dev *netdev_dev, bool destroy)
+netdev_uninit(struct netdev *netdev, bool destroy)
 {
-    char *name = netdev_dev->name;
+    char *name = netdev->name;
 
-    assert(!netdev_dev->ref_cnt);
+    ovs_assert(!netdev->ref_cnt);
+    ovs_assert(list_is_empty(&netdev->saved_flags_list));
 
-    shash_delete(&netdev_dev_shash, netdev_dev->node);
+    shash_delete(&netdev_shash, netdev->node);
 
     if (destroy) {
-        netdev_dev->netdev_class->destroy(netdev_dev);
+        netdev->netdev_class->destroy(netdev);
     }
     free(name);
 }
 
-/* Returns the class type of 'netdev_dev'.
+/* Returns the class type of 'netdev'.
  *
  * The caller must not free the returned value. */
 const char *
-netdev_dev_get_type(const struct netdev_dev *netdev_dev)
+netdev_get_type(const struct netdev *netdev)
 {
-    return netdev_dev->netdev_class->type;
+    return netdev->netdev_class->type;
 }
 
-/* Returns the class associated with 'netdev_dev'. */
+/* Returns the class associated with 'netdev'. */
 const struct netdev_class *
-netdev_dev_get_class(const struct netdev_dev *netdev_dev)
+netdev_get_class(const struct netdev *netdev)
 {
-    return netdev_dev->netdev_class;
+    return netdev->netdev_class;
 }
 
-/* Returns the name of 'netdev_dev'.
+/* Returns the netdev with 'name' or NULL if there is none.
  *
  * The caller must not free the returned value. */
-const char *
-netdev_dev_get_name(const struct netdev_dev *netdev_dev)
+struct netdev *
+netdev_from_name(const char *name)
 {
-    return netdev_dev->name;
-}
-
-/* Returns the netdev_dev with 'name' or NULL if there is none.
- *
- * The caller must not free the returned value. */
-struct netdev_dev *
-netdev_dev_from_name(const char *name)
-{
-    return shash_find_data(&netdev_dev_shash, name);
+    return shash_find_data(&netdev_shash, name);
 }
 
 /* Fills 'device_list' with devices that match 'netdev_class'.
  *
  * The caller is responsible for initializing and destroying 'device_list'
- * but the contained netdev_devs must not be freed. */
+ * but the contained netdevs must not be freed. */
 void
-netdev_dev_get_devices(const struct netdev_class *netdev_class,
-                       struct shash *device_list)
+netdev_get_devices(const struct netdev_class *netdev_class,
+                   struct shash *device_list)
 {
     struct shash_node *node;
-    SHASH_FOR_EACH (node, &netdev_dev_shash) {
-        struct netdev_dev *dev = node->data;
+    SHASH_FOR_EACH (node, &netdev_shash) {
+        struct netdev *dev = node->data;
 
         if (dev->netdev_class == netdev_class) {
             shash_add(device_list, node->name, node->data);
@@ -1381,81 +1411,65 @@ netdev_dev_get_devices(const struct netdev_class *netdev_class,
     }
 }
 
-/* Initializes 'netdev' as a instance of the netdev_dev.
- *
- * This function adds 'netdev' to a netdev-owned linked list, so it is very
- * important that 'netdev' only be freed after calling netdev_close(). */
-void
-netdev_init(struct netdev *netdev, struct netdev_dev *netdev_dev)
+const char *
+netdev_get_type_from_name(const char *name)
 {
-    memset(netdev, 0, sizeof *netdev);
-    netdev->netdev_dev = netdev_dev;
-    list_push_back(&netdev_list, &netdev->node);
+    const struct netdev *dev = netdev_from_name(name);
+    return dev ? netdev_get_type(dev) : NULL;
 }
-
-/* Undoes the results of initialization.
- *
- * Normally this function only needs to be called from netdev_close().
- * However, it may be called by providers due to an error on opening
- * that occurs after initialization.  It this case netdev_close() would
- * never be called. */
+
 void
-netdev_uninit(struct netdev *netdev, bool close)
+netdev_rx_init(struct netdev_rx *rx, struct netdev *netdev,
+               const struct netdev_rx_class *class)
 {
-    /* Restore flags that we changed, if any. */
-    int error = restore_flags(netdev);
-    list_remove(&netdev->node);
-    if (error) {
-        VLOG_WARN("failed to restore network device flags on %s: %s",
-                  netdev_get_name(netdev), strerror(error));
-    }
-
-    if (close) {
-        netdev_get_dev(netdev)->netdev_class->close(netdev);
-    }
+    ovs_assert(netdev->ref_cnt > 0);
+    rx->rx_class = class;
+    rx->netdev = netdev;
 }
 
-
-/* Returns the class type of 'netdev'.
- *
- * The caller must not free the returned value. */
-const char *
-netdev_get_type(const struct netdev *netdev)
+void
+netdev_rx_uninit(struct netdev_rx *rx OVS_UNUSED)
 {
-    return netdev_get_dev(netdev)->netdev_class->type;
+    /* Nothing to do. */
 }
 
-struct netdev_dev *
-netdev_get_dev(const struct netdev *netdev)
+struct netdev *
+netdev_rx_get_netdev(const struct netdev_rx *rx)
 {
-    return netdev->netdev_dev;
+    ovs_assert(rx->netdev->ref_cnt > 0);
+    return rx->netdev;
 }
-
-/* Restore the network device flags on 'netdev' to those that were active
- * before we changed them.  Returns 0 if successful, otherwise a positive
- * errno value.
- *
- * To avoid reentry, the caller must ensure that fatal signals are blocked. */
-static int
-restore_flags(struct netdev *netdev)
+
+const char *
+netdev_rx_get_name(const struct netdev_rx *rx)
 {
-    if (netdev->changed_flags) {
-        enum netdev_flags restore = netdev->save_flags & netdev->changed_flags;
-        enum netdev_flags old_flags;
-        return netdev_get_dev(netdev)->netdev_class->update_flags(netdev,
-                                           netdev->changed_flags & ~restore,
-                                           restore, &old_flags);
-    }
-    return 0;
+    return netdev_get_name(netdev_rx_get_netdev(rx));
 }
 
-/* Close all netdevs on shutdown so they can do any needed cleanup such as
- * destroying devices, restoring flags, etc. */
 static void
-close_all_netdevs(void *aux OVS_UNUSED)
+restore_all_flags(void *aux OVS_UNUSED)
 {
-    struct netdev *netdev, *next;
-    LIST_FOR_EACH_SAFE(netdev, next, node, &netdev_list) {
-        netdev_close(netdev);
+    struct shash_node *node;
+
+    SHASH_FOR_EACH (node, &netdev_shash) {
+        struct netdev *netdev = node->data;
+        const struct netdev_saved_flags *sf;
+        enum netdev_flags saved_values;
+        enum netdev_flags saved_flags;
+
+        saved_values = saved_flags = 0;
+        LIST_FOR_EACH (sf, node, &netdev->saved_flags_list) {
+            saved_flags |= sf->saved_flags;
+            saved_values &= ~sf->saved_flags;
+            saved_values |= sf->saved_flags & sf->saved_values;
+        }
+        if (saved_flags) {
+            enum netdev_flags old_flags;
+
+            netdev->netdev_class->update_flags(netdev,
+                                               saved_flags & saved_values,
+                                               saved_flags & ~saved_values,
+                                               &old_flags);
+        }
     }
 }