netdev: Decouple creating and configuring network devices.

[sliver-openvswitch.git] / lib / netdev.h

diff --git a/lib/netdev.h b/lib/netdev.h
index ba4a8e3..bcbd8b0 100644 (file)
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -44,12 +44,6 @@ enum netdev_flags {
     NETDEV_LOOPBACK = 0x0004    /* This is a loopback device. */
 };
 
-enum netdev_pseudo_ethertype {
-    NETDEV_ETH_TYPE_NONE = -128, /* Receive no frames. */
-    NETDEV_ETH_TYPE_ANY,         /* Receive all frames. */
-    NETDEV_ETH_TYPE_802_2        /* Receive all IEEE 802.2 frames. */
-};
-
 /* Network device statistics.
  *
  * Values of unsupported statistics are set to all-1-bits (UINT64_MAX). */
@@ -84,8 +78,6 @@ struct netdev_stats {
 struct netdev_options {
     const char *name;
     const char *type;
-    const struct shash *args;
-    int ethertype;
 };
 
 struct netdev;
@@ -108,7 +100,7 @@ int netdev_enumerate(struct sset *);
 
 /* Options. */
 int netdev_set_config(struct netdev *, const struct shash *args);
-const struct shash *netdev_get_config(const struct netdev *);
+int netdev_get_config(const struct netdev *, struct shash *);
 
 /* Basic properties. */
 const char *netdev_get_name(const struct netdev *);
@@ -117,6 +109,7 @@ int netdev_get_mtu(const struct netdev *, int *mtup);
 int netdev_get_ifindex(const struct netdev *);
 
 /* Packet send and receive. */
+int netdev_listen(struct netdev *);
 int netdev_recv(struct netdev *, struct ofpbuf *);
 void netdev_recv_wait(struct netdev *);
 int netdev_drain(struct netdev *);