X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetdev.h;h=e6fadb05d0bcf9e1d26e9dbd096c1825f26de5f8;hb=219c9a73dc5bdff5c1350cc1b9cc10e405fefed2;hp=6635a55a3f5e5e2a421a61d0e88e5f16fbe0ad83;hpb=85da620e9788b473797b95212b916327974e6942;p=openvswitch

diff --git a/lib/netdev.h b/lib/netdev.h
index 6635a55a..e6fadb05 100644
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ struct ofpbuf;
 struct in_addr;
 struct in6_addr;
 struct shash;
-struct svec;
+struct sset;
 
 enum netdev_flags {
     NETDEV_UP = 0x0001,         /* Device enabled? */
@@ -93,18 +93,21 @@ struct netdev_class;
 void netdev_run(void);
 void netdev_wait(void);
 
-void netdev_enumerate_types(struct svec *types);
+void netdev_enumerate_types(struct sset *types);
 
 /* Open and close. */
 int netdev_open(struct netdev_options *, struct netdev **);
 int netdev_open_default(const char *name, struct netdev **);
-int netdev_reconfigure(struct netdev *, const struct shash *args);
 void netdev_close(struct netdev *);
 
 bool netdev_exists(const char *name);
 bool netdev_is_open(const char *name);
 
-int netdev_enumerate(struct svec *);
+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 *);
 
 /* Basic properties. */
 const char *netdev_get_name(const struct netdev *);
@@ -126,7 +129,8 @@ int netdev_get_etheraddr(const struct netdev *, uint8_t mac[6]);
 
 /* PHY interface. */
 bool netdev_get_carrier(const struct netdev *);
-int netdev_get_features(struct netdev *,
+bool netdev_get_miimon(const struct netdev *);
+int netdev_get_features(const struct netdev *,
                         uint32_t *current, uint32_t *advertised,
                         uint32_t *supported, uint32_t *peer);
 uint64_t netdev_features_to_bps(uint32_t features);
@@ -141,6 +145,7 @@ int netdev_get_in6(const struct netdev *, struct in6_addr *);
 int netdev_add_router(struct netdev *, struct in_addr router);
 int netdev_get_next_hop(const struct netdev *, const struct in_addr *host,
                         struct in_addr *next_hop, char **);
+int netdev_get_status(const struct netdev *, struct shash *sh);
 int netdev_arp_lookup(const struct netdev *, uint32_t ip, uint8_t mac[6]);
 
 int netdev_get_flags(const struct netdev *, enum netdev_flags *);
@@ -168,7 +173,7 @@ struct netdev_queue_stats {
 int netdev_set_policing(struct netdev *, uint32_t kbits_rate,
                         uint32_t kbits_burst);
 
-int netdev_get_qos_types(const struct netdev *, struct svec *types);
+int netdev_get_qos_types(const struct netdev *, struct sset *types);
 int netdev_get_qos_capabilities(const struct netdev *,
                                 const char *type,
                                 struct netdev_qos_capabilities *);