X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=2b4dec4cb472677083ed9de076104c23eabd4ffd;hb=1e3f34c7693bcabae8e443ac1b246680ef9b60e2;hp=9445bdf8bdda3df9f6e40a51b81a14c12d0adeb4;hpb=ffa2665decbf47eb2a1ce642944144061454940c;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 9445bdf8b..2b4dec4cb 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 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. @@ -37,6 +37,7 @@ #include "packets.h" #include "poll-loop.h" #include "shash.h" +#include "smap.h" #include "sset.h" #include "svec.h" #include "vlog.h" @@ -80,6 +81,10 @@ netdev_initialize(void) netdev_register_provider(&netdev_tap_class); netdev_register_provider(&netdev_tap_pl_class); netdev_vport_register(); +#endif +#ifdef __FreeBSD__ + netdev_register_provider(&netdev_tap_class); + netdev_register_provider(&netdev_bsd_class); #endif netdev_register_provider(&netdev_tunnel_class); } @@ -245,15 +250,15 @@ netdev_open(const char *name, const char *type, struct netdev **netdevp) /* Reconfigures the device 'netdev' with 'args'. 'args' may be empty * or NULL if none are needed. */ int -netdev_set_config(struct netdev *netdev, const struct shash *args) +netdev_set_config(struct netdev *netdev, const struct smap *args) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); if (netdev_dev->netdev_class->set_config) { - struct shash no_args = SHASH_INITIALIZER(&no_args); + struct smap no_args = SMAP_INITIALIZER(&no_args); return netdev_dev->netdev_class->set_config(netdev_dev, args ? args : &no_args); - } else if (args && !shash_is_empty(args)) { + } else if (args && !smap_is_empty(args)) { VLOG_WARN("%s: arguments provided to device that is not configurable", netdev_get_name(netdev)); } @@ -262,23 +267,23 @@ netdev_set_config(struct netdev *netdev, const struct shash *args) } /* Returns the current configuration for 'netdev' in 'args'. The caller must - * have already initialized 'args' with shash_init(). Returns 0 on success, in + * have already initialized 'args' with smap_init(). Returns 0 on success, in * which case 'args' will be filled with 'netdev''s configuration. On failure * returns a positive errno value, in which case 'args' will be empty. * * The caller owns 'args' and its contents and must eventually free them with - * shash_destroy_free_data(). */ + * smap_destroy(). */ int -netdev_get_config(const struct netdev *netdev, struct shash *args) +netdev_get_config(const struct netdev *netdev, struct smap *args) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); int error; - shash_clear_free_data(args); + smap_clear(args); if (netdev_dev->netdev_class->get_config) { error = netdev_dev->netdev_class->get_config(netdev_dev, args); if (error) { - shash_clear_free_data(args); + smap_clear(args); } } else { error = 0; @@ -761,18 +766,18 @@ netdev_get_next_hop(const struct netdev *netdev, return error; } -/* Populates 'sh' with status information. +/* Populates 'smap' with status information. * - * Populates 'sh' with 'netdev' specific status information. This information - * may be used to populate the status column of the Interface table as defined - * in ovs-vswitchd.conf.db(5). */ + * Populates 'smap' with 'netdev' specific status information. This + * information may be used to populate the status column of the Interface table + * as defined in ovs-vswitchd.conf.db(5). */ int -netdev_get_drv_info(const struct netdev *netdev, struct shash *sh) +netdev_get_drv_info(const struct netdev *netdev, struct smap *smap) { struct netdev_dev *dev = netdev_get_dev(netdev); return (dev->netdev_class->get_drv_info - ? dev->netdev_class->get_drv_info(netdev, sh) + ? dev->netdev_class->get_drv_info(netdev, smap) : EOPNOTSUPP); } @@ -844,7 +849,7 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off, int netdev_get_flags(const struct netdev *netdev_, enum netdev_flags *flagsp) { - struct netdev *netdev = (struct netdev *) netdev_; + struct netdev *netdev = CONST_CAST(struct netdev *, netdev_); return do_update_flags(netdev, 0, 0, flagsp, false); } @@ -1067,10 +1072,9 @@ netdev_get_n_queues(const struct netdev *netdev, * * A '*typep' of "" indicates that QoS is currently disabled on 'netdev'. * - * The caller must initialize 'details' as an empty shash (e.g. with - * shash_init()) before calling this function. The caller must free 'details', - * including 'data' members, when it is no longer needed (e.g. with - * shash_destroy_free_data()). + * The caller must initialize 'details' as an empty smap (e.g. with + * smap_init()) before calling this function. The caller must free 'details' + * when it is no longer needed (e.g. with smap_destroy()). * * The caller must not modify or free '*typep'. * @@ -1080,7 +1084,7 @@ netdev_get_n_queues(const struct netdev *netdev, * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). */ int netdev_get_qos(const struct netdev *netdev, - const char **typep, struct shash *details) + const char **typep, struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; int retval; @@ -1089,7 +1093,7 @@ netdev_get_qos(const struct netdev *netdev, retval = class->get_qos(netdev, typep, details); if (retval) { *typep = NULL; - shash_clear_free_data(details); + smap_clear(details); } return retval; } else { @@ -1119,7 +1123,7 @@ netdev_get_qos(const struct netdev *netdev, * details. */ int netdev_set_qos(struct netdev *netdev, - const char *type, const struct shash *details) + const char *type, const struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; @@ -1129,7 +1133,7 @@ netdev_set_qos(struct netdev *netdev, if (class->set_qos) { if (!details) { - static struct shash empty = SHASH_INITIALIZER(&empty); + static struct smap empty = SMAP_INITIALIZER(&empty); details = ∅ } return class->set_qos(netdev, type, details); @@ -1149,12 +1153,12 @@ netdev_set_qos(struct netdev *netdev, * given 'type' in the "other_config" column in the "Queue" table in * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). * - * The caller must initialize 'details' (e.g. with shash_init()) before calling - * this function. The caller must free 'details', including 'data' members, - * when it is no longer needed (e.g. with shash_destroy_free_data()). */ + * The caller must initialize 'details' (e.g. with smap_init()) before calling + * this function. The caller must free 'details' when it is no longer needed + * (e.g. with smap_destroy()). */ int netdev_get_queue(const struct netdev *netdev, - unsigned int queue_id, struct shash *details) + unsigned int queue_id, struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; int retval; @@ -1163,7 +1167,7 @@ netdev_get_queue(const struct netdev *netdev, ? class->get_queue(netdev, queue_id, details) : EOPNOTSUPP); if (retval) { - shash_clear_free_data(details); + smap_clear(details); } return retval; } @@ -1182,7 +1186,7 @@ netdev_get_queue(const struct netdev *netdev, * it. */ int netdev_set_queue(struct netdev *netdev, - unsigned int queue_id, const struct shash *details) + unsigned int queue_id, const struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; return (class->set_queue