X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.h;h=4b86c21efcc3ca9d92790fc00c4a21d8c635259e;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=ba4a8e3d1ee0c488ce92fd7d676a2dc5b6145f7a;hpb=943e5afe0b450fc665a4a162fe1bacafd34d18e8;p=sliver-openvswitch.git diff --git a/lib/netdev.h b/lib/netdev.h index ba4a8e3d1..4b86c21ef 100644 --- a/lib/netdev.h +++ b/lib/netdev.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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,23 +118,48 @@ 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); + +/* Features. */ +enum netdev_features { + NETDEV_F_10MB_HD = 1 << 0, /* 10 Mb half-duplex rate support. */ + NETDEV_F_10MB_FD = 1 << 1, /* 10 Mb full-duplex rate support. */ + NETDEV_F_100MB_HD = 1 << 2, /* 100 Mb half-duplex rate support. */ + NETDEV_F_100MB_FD = 1 << 3, /* 100 Mb full-duplex rate support. */ + NETDEV_F_1GB_HD = 1 << 4, /* 1 Gb half-duplex rate support. */ + NETDEV_F_1GB_FD = 1 << 5, /* 1 Gb full-duplex rate support. */ + NETDEV_F_10GB_FD = 1 << 6, /* 10 Gb full-duplex rate support. */ + NETDEV_F_40GB_FD = 1 << 7, /* 40 Gb full-duplex rate support. */ + NETDEV_F_100GB_FD = 1 << 8, /* 100 Gb full-duplex rate support. */ + NETDEV_F_1TB_FD = 1 << 9, /* 1 Tb full-duplex rate support. */ + NETDEV_F_OTHER = 1 << 10, /* Other rate, not in the list. */ + NETDEV_F_COPPER = 1 << 11, /* Copper medium. */ + NETDEV_F_FIBER = 1 << 12, /* Fiber medium. */ + NETDEV_F_AUTONEG = 1 << 13, /* Auto-negotiation. */ + NETDEV_F_PAUSE = 1 << 14, /* Pause. */ + NETDEV_F_PAUSE_ASYM = 1 << 15, /* Asymmetric pause. */ +}; + 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); -bool netdev_features_is_full_duplex(uint32_t features); -int netdev_set_advertisements(struct netdev *, uint32_t advertise); + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer); +uint64_t netdev_features_to_bps(enum netdev_features features); +bool netdev_features_is_full_duplex(enum netdev_features features); +int netdev_set_advertisements(struct netdev *, enum netdev_features advertise); /* TCP/IP stack interface. */ 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, struct in_addr *next_hop, char **); -int netdev_get_status(const struct netdev *, struct shash *sh); +int netdev_get_drv_info(const struct netdev *, struct shash *sh); int netdev_arp_lookup(const struct netdev *, ovs_be32 ip, uint8_t mac[6]); int netdev_get_flags(const struct netdev *, enum netdev_flags *); @@ -207,9 +220,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