X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetdev.h;h=24a9b6441359d833f86f9a1e5a756c4ed7437b16;hb=6b8558f867edc8a9e1e2e2bd4f052a57caf5e863;hp=ba4a8e3d1ee0c488ce92fd7d676a2dc5b6145f7a;hpb=943e5afe0b450fc665a4a162fe1bacafd34d18e8;p=openvswitch

diff --git a/lib/netdev.h b/lib/netdev.h
index ba4a8e3d..24a9b644 100644
--- 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). */
@@ -81,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;
 
@@ -97,26 +84,27 @@ 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);
 bool netdev_is_open(const char *name);
 
-int netdev_enumerate(struct sset *);
+void netdev_parse_name(const char *netdev_name, char **name, char **type);
 
 /* 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 *);
 const char *netdev_get_type(const struct netdev *);
 int netdev_get_mtu(const struct netdev *, int *mtup);
+int netdev_set_mtu(const struct netdev *, int mtu);
 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 *);
@@ -130,6 +118,7 @@ int netdev_get_etheraddr(const struct netdev *, uint8_t mac[6]);
 
 /* PHY interface. */
 bool netdev_get_carrier(const struct netdev *);
+long long int netdev_get_carrier_resets(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,
@@ -142,6 +131,7 @@ int netdev_set_advertisements(struct netdev *, uint32_t advertise);
 int netdev_get_in4(const struct netdev *, struct in_addr *address,
                    struct in_addr *netmask);
 int netdev_set_in4(struct netdev *, struct in_addr addr, struct in_addr mask);
+int netdev_get_in4_by_name(const char *device_name, struct in_addr *in4);
 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,
@@ -207,9 +197,6 @@ int netdev_dump_queue_stats(const struct netdev *,
 
 unsigned int netdev_change_seq(const struct netdev *netdev);
 
-/* Linux stuff. */
-int netdev_get_vlan_vid(const struct netdev *, int *vlan_vid);
-
 #ifdef  __cplusplus
 }
 #endif