X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetdev.h;h=13d2ee76e8e66ae54fd4a5d17d81577c1a4490b5;hb=57d6a4c71bd0b4ed477ec273d4d4f84c5e4ed465;hp=e6fadb05d0bcf9e1d26e9dbd096c1825f26de5f8;hpb=19993ef3caac9964c2bef6e31fc8699c4f4b53c8;p=openvswitch

diff --git a/lib/netdev.h b/lib/netdev.h
index e6fadb05..13d2ee76 100644
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -20,6 +20,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include "openvswitch/types.h"
 
 #ifdef  __cplusplus
 extern "C" {
@@ -43,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). */
@@ -80,13 +75,6 @@ struct netdev_stats {
     uint64_t tx_window_errors;
 };
 
-struct netdev_options {
-    const char *name;
-    const char *type;
-    const struct shash *args;
-    int ethertype;
-};
-
 struct netdev;
 struct netdev_class;
 
@@ -96,8 +84,7 @@ void netdev_wait(void);
 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_open(const char *name, const char *type, struct netdev **);
 void netdev_close(struct netdev *);
 
 bool netdev_exists(const char *name);
@@ -107,7 +94,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 *);
@@ -116,6 +103,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 *);
@@ -129,7 +117,7 @@ int netdev_get_etheraddr(const struct netdev *, uint8_t mac[6]);
 
 /* PHY interface. */
 bool netdev_get_carrier(const struct netdev *);
-bool netdev_get_miimon(const struct netdev *);
+int netdev_set_miimon_interval(struct netdev *, long long int interval);
 int netdev_get_features(const struct netdev *,
                         uint32_t *current, uint32_t *advertised,
                         uint32_t *supported, uint32_t *peer);
@@ -146,7 +134,7 @@ 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_arp_lookup(const struct netdev *, ovs_be32 ip, uint8_t mac[6]);
 
 int netdev_get_flags(const struct netdev *, enum netdev_flags *);
 int netdev_set_flags(struct netdev *, enum netdev_flags, bool permanent);
@@ -204,17 +192,11 @@ typedef void netdev_dump_queue_stats_cb(unsigned int queue_id,
 int netdev_dump_queue_stats(const struct netdev *,
                             netdev_dump_queue_stats_cb *, void *aux);
 
+unsigned int netdev_change_seq(const struct netdev *netdev);
+
 /* Linux stuff. */
 int netdev_get_vlan_vid(const struct netdev *, int *vlan_vid);
 
-/* Monitoring for changes in network device status. */
-struct netdev_monitor *netdev_monitor_create(void);
-void netdev_monitor_destroy(struct netdev_monitor *);
-int netdev_monitor_add(struct netdev_monitor *, struct netdev *);
-void netdev_monitor_remove(struct netdev_monitor *, struct netdev *);
-int netdev_monitor_poll(struct netdev_monitor *, char **devnamep);
-void netdev_monitor_poll_wait(const struct netdev_monitor *);
-
 #ifdef  __cplusplus
 }
 #endif