X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=3c528a8d6a515232e41b3dc386801c678fddea6b;hb=d1673b006d53fdea72c0744e835362ed1917f879;hp=995492927bf2fdc4bfd9c34e3957ac253953d9d3;hpb=7b6b0ef47e398a2fbda48fd385f9781b2df8bebb;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 995492927..3c528a8d6 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ #include #include "netdev.h" -#include #include #include #include @@ -37,6 +36,7 @@ #include "packets.h" #include "poll-loop.h" #include "shash.h" +#include "smap.h" #include "sset.h" #include "svec.h" #include "vlog.h" @@ -74,12 +74,18 @@ netdev_initialize(void) fatal_signal_add_hook(close_all_netdevs, NULL, NULL, true); -#ifdef HAVE_NETLINK +#ifdef LINUX_DATAPATH netdev_register_provider(&netdev_linux_class); netdev_register_provider(&netdev_internal_class); netdev_register_provider(&netdev_tap_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); + netdev_register_provider(&netdev_pltap_class); } } @@ -192,58 +198,39 @@ netdev_enumerate_types(struct sset *types) } } -void -update_device_args(struct netdev_dev *dev, const struct shash *args) -{ - smap_destroy(&dev->args); - smap_clone(&dev->args, args); -} - -/* Opens the network device named 'name' (e.g. "eth0") and returns zero if - * successful, otherwise a positive errno value. On success, sets '*netdevp' - * to the new network device, otherwise to null. +/* Opens the network device named 'name' (e.g. "eth0") of the specified 'type' + * (e.g. "system") and returns zero if successful, otherwise a positive errno + * value. On success, sets '*netdevp' to the new network device, otherwise to + * null. * - * If this is the first time the device has been opened, then create is called - * before opening. The device is created using the given type and - * arguments. */ + * Some network devices may need to be configured (with netdev_set_config()) + * before they can be used. */ int -netdev_open(struct netdev_options *options, struct netdev **netdevp) +netdev_open(const char *name, const char *type, struct netdev **netdevp) { - struct shash empty_args = SHASH_INITIALIZER(&empty_args); struct netdev_dev *netdev_dev; int error; *netdevp = NULL; netdev_initialize(); - if (!options->args) { - options->args = &empty_args; - } - - netdev_dev = shash_find_data(&netdev_dev_shash, options->name); + netdev_dev = shash_find_data(&netdev_dev_shash, name); if (!netdev_dev) { const struct netdev_class *class; - class = netdev_lookup_provider(options->type); + class = netdev_lookup_provider(type); if (!class) { VLOG_WARN("could not create netdev %s of unknown type %s", - options->name, options->type); + name, type); return EAFNOSUPPORT; } - error = class->create(class, options->name, options->args, - &netdev_dev); + error = class->create(class, name, &netdev_dev); if (error) { return error; } - assert(netdev_dev->netdev_class == class); - - } else if (!shash_is_empty(options->args) && - !netdev_dev_args_equal(netdev_dev, options->args)) { + ovs_assert(netdev_dev->netdev_class == class); - VLOG_WARN("%s: attempted to open already open netdev with " - "different arguments", options->name); - return EINVAL; } error = netdev_dev->netdev_class->open(netdev_dev, netdevp); @@ -259,52 +246,61 @@ netdev_open(struct netdev_options *options, struct netdev **netdevp) return error; } +/* Reconfigures the device 'netdev' with 'args'. 'args' may be empty + * or NULL if none are needed. */ int -netdev_open_default(const char *name, struct netdev **netdevp) +netdev_set_config(struct netdev *netdev, const struct smap *args) { - struct netdev_options options; + struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - memset(&options, 0, sizeof options); - options.name = name; + if (netdev_dev->netdev_class->set_config) { + struct smap no_args = SMAP_INITIALIZER(&no_args); + return netdev_dev->netdev_class->set_config(netdev_dev, + args ? args : &no_args); + } else if (args && !smap_is_empty(args)) { + VLOG_WARN("%s: arguments provided to device that is not configurable", + netdev_get_name(netdev)); + } - return netdev_open(&options, netdevp); + return 0; } -/* Reconfigures the device 'netdev' with 'args'. 'args' may be empty - * or NULL if none are needed. */ +/* Returns the current configuration for 'netdev' in 'args'. The caller must + * 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 + * smap_destroy(). */ int -netdev_set_config(struct netdev *netdev, const struct shash *args) +netdev_get_config(const struct netdev *netdev, struct smap *args) { - struct shash empty_args = SHASH_INITIALIZER(&empty_args); struct netdev_dev *netdev_dev = netdev_get_dev(netdev); + int error; - if (!args) { - args = &empty_args; - } - - if (netdev_dev->netdev_class->set_config) { - if (!netdev_dev_args_equal(netdev_dev, args)) { - update_device_args(netdev_dev, args); - return netdev_dev->netdev_class->set_config(netdev_dev, args); + smap_clear(args); + if (netdev_dev->netdev_class->get_config) { + error = netdev_dev->netdev_class->get_config(netdev_dev, args); + if (error) { + smap_clear(args); } - } else if (!shash_is_empty(args)) { - VLOG_WARN("%s: arguments provided to device whose configuration " - "cannot be changed", netdev_get_name(netdev)); + } else { + error = 0; } - return 0; + return error; } -/* Returns the current configuration for 'netdev'. This is either the - * configuration passed to netdev_open() or netdev_set_config(), or it is a - * configuration retrieved from the device itself if no configuration was - * passed to those functions. - * - * 'netdev' retains ownership of the returned configuration. */ -const struct shash * -netdev_get_config(const struct netdev *netdev) +const struct netdev_tunnel_config * +netdev_get_tunnel_config(const struct netdev *netdev) { - return &netdev_get_dev(netdev)->args; + struct netdev_dev *netdev_dev = netdev_get_dev(netdev); + + if (netdev_dev->netdev_class->get_tunnel_config) { + return netdev_dev->netdev_class->get_tunnel_config(netdev_dev); + } else { + return NULL; + } } /* Closes and destroys 'netdev'. */ @@ -314,7 +310,7 @@ netdev_close(struct netdev *netdev) if (netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(netdev_dev->ref_cnt); + ovs_assert(netdev_dev->ref_cnt); netdev_dev->ref_cnt--; netdev_uninit(netdev, true); @@ -333,7 +329,7 @@ netdev_exists(const char *name) struct netdev *netdev; int error; - error = netdev_open_default(name, &netdev); + error = netdev_open(name, "system", &netdev); if (!error) { netdev_close(netdev); return true; @@ -354,31 +350,23 @@ netdev_is_open(const char *name) return !!shash_find_data(&netdev_dev_shash, name); } -/* Clears 'sset' and enumerates the names of all known network devices. */ -int -netdev_enumerate(struct sset *sset) +/* Parses 'netdev_name_', which is of the form [type@]name into its component + * pieces. 'name' and 'type' must be freed by the caller. */ +void +netdev_parse_name(const char *netdev_name_, char **name, char **type) { - struct shash_node *node; - int error = 0; + char *netdev_name = xstrdup(netdev_name_); + char *separator; - netdev_initialize(); - sset_clear(sset); - - SHASH_FOR_EACH(node, &netdev_classes) { - const struct netdev_class *netdev_class = node->data; - if (netdev_class->enumerate) { - int retval = netdev_class->enumerate(sset); - if (retval) { - VLOG_WARN("failed to enumerate %s network devices: %s", - netdev_class->type, strerror(retval)); - if (!error) { - error = retval; - } - } - } + separator = strchr(netdev_name, '@'); + if (separator) { + *separator = '\0'; + *type = netdev_name; + *name = xstrdup(separator + 1); + } else { + *name = netdev_name; + *type = xstrdup("system"); } - - return error; } /* Attempts to set up 'netdev' for receiving packets with netdev_recv(). @@ -417,8 +405,8 @@ netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) int (*recv)(struct netdev *, void *, size_t); int retval; - assert(buffer->size == 0); - assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); + ovs_assert(buffer->size == 0); + ovs_assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); recv = netdev_get_dev(netdev)->netdev_class->recv; retval = (recv @@ -532,19 +520,45 @@ netdev_get_name(const struct netdev *netdev) * (and received) packets, in bytes, not including the hardware header; thus, * this is typically 1500 bytes for Ethernet devices. * - * If successful, returns 0 and stores the MTU size in '*mtup'. Stores INT_MAX - * in '*mtup' if 'netdev' does not have an MTU (as e.g. some tunnels do not).On - * failure, returns a positive errno value and stores ETH_PAYLOAD_MAX (1500) in - * '*mtup'. */ + * If successful, returns 0 and stores the MTU size in '*mtup'. Returns + * EOPNOTSUPP if 'netdev' does not have an MTU (as e.g. some tunnels do not). + * On other failure, returns a positive errno value. On failure, sets '*mtup' + * to 0. */ int netdev_get_mtu(const struct netdev *netdev, int *mtup) { - int error = netdev_get_dev(netdev)->netdev_class->get_mtu(netdev, mtup); + const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; + int error; + + error = class->get_mtu ? class->get_mtu(netdev, mtup) : EOPNOTSUPP; if (error) { - VLOG_WARN_RL(&rl, "failed to retrieve MTU for network device %s: %s", + *mtup = 0; + if (error != EOPNOTSUPP) { + VLOG_DBG_RL(&rl, "failed to retrieve MTU for network device %s: " + "%s", netdev_get_name(netdev), strerror(error)); + } + } + return error; +} + +/* Sets the MTU of 'netdev'. The MTU is the maximum size of transmitted + * (and received) packets, in bytes. + * + * If successful, returns 0. Returns EOPNOTSUPP if 'netdev' does not have an + * MTU (as e.g. some tunnels do not). On other failure, returns a positive + * errno value. */ +int +netdev_set_mtu(const struct netdev *netdev, int mtu) +{ + const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; + int error; + + error = class->set_mtu ? class->set_mtu(netdev, mtu) : EOPNOTSUPP; + if (error && error != EOPNOTSUPP) { + VLOG_DBG_RL(&rl, "failed to set MTU for network device %s: %s", netdev_get_name(netdev), strerror(error)); - *mtup = ETH_PAYLOAD_MAX; } + return error; } @@ -580,13 +594,17 @@ netdev_get_ifindex(const struct netdev *netdev) * cases this function will always return EOPNOTSUPP. */ int netdev_get_features(const struct netdev *netdev, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer) + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer) { int (*get_features)(const struct netdev *netdev, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer); - uint32_t dummy[4]; + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer); + enum netdev_features dummy[4]; int error; if (!current) { @@ -604,7 +622,8 @@ netdev_get_features(const struct netdev *netdev, get_features = netdev_get_dev(netdev)->netdev_class->get_features; error = get_features - ? get_features(netdev, current, advertised, supported, peer) + ? get_features(netdev, current, advertised, supported, + peer) : EOPNOTSUPP; if (error) { *current = *advertised = *supported = *peer = 0; @@ -612,39 +631,48 @@ netdev_get_features(const struct netdev *netdev, return error; } -/* Returns the maximum speed of a network connection that has the "enum - * ofp_port_features" bits in 'features', in bits per second. If no bits that - * indicate a speed are set in 'features', assumes 100Mbps. */ +/* Returns the maximum speed of a network connection that has the NETDEV_F_* + * bits in 'features', in bits per second. If no bits that indicate a speed + * are set in 'features', returns 'default_bps'. */ uint64_t -netdev_features_to_bps(uint32_t features) +netdev_features_to_bps(enum netdev_features features, + uint64_t default_bps) { enum { - F_10000MB = OFPPF_10GB_FD, - F_1000MB = OFPPF_1GB_HD | OFPPF_1GB_FD, - F_100MB = OFPPF_100MB_HD | OFPPF_100MB_FD, - F_10MB = OFPPF_10MB_HD | OFPPF_10MB_FD + F_1000000MB = NETDEV_F_1TB_FD, + F_100000MB = NETDEV_F_100GB_FD, + F_40000MB = NETDEV_F_40GB_FD, + F_10000MB = NETDEV_F_10GB_FD, + F_1000MB = NETDEV_F_1GB_HD | NETDEV_F_1GB_FD, + F_100MB = NETDEV_F_100MB_HD | NETDEV_F_100MB_FD, + F_10MB = NETDEV_F_10MB_HD | NETDEV_F_10MB_FD }; - return ( features & F_10000MB ? UINT64_C(10000000000) - : features & F_1000MB ? UINT64_C(1000000000) - : features & F_100MB ? UINT64_C(100000000) - : features & F_10MB ? UINT64_C(10000000) - : UINT64_C(100000000)); + return ( features & F_1000000MB ? UINT64_C(1000000000000) + : features & F_100000MB ? UINT64_C(100000000000) + : features & F_40000MB ? UINT64_C(40000000000) + : features & F_10000MB ? UINT64_C(10000000000) + : features & F_1000MB ? UINT64_C(1000000000) + : features & F_100MB ? UINT64_C(100000000) + : features & F_10MB ? UINT64_C(10000000) + : default_bps); } -/* Returns true if any of the "enum ofp_port_features" bits that indicate a - * full-duplex link are set in 'features', otherwise false. */ +/* Returns true if any of the NETDEV_F_* bits that indicate a full-duplex link + * are set in 'features', otherwise false. */ bool -netdev_features_is_full_duplex(uint32_t features) +netdev_features_is_full_duplex(enum netdev_features features) { - return (features & (OFPPF_10MB_FD | OFPPF_100MB_FD | OFPPF_1GB_FD - | OFPPF_10GB_FD)) != 0; + return (features & (NETDEV_F_10MB_FD | NETDEV_F_100MB_FD | NETDEV_F_1GB_FD + | NETDEV_F_10GB_FD | NETDEV_F_40GB_FD + | NETDEV_F_100GB_FD | NETDEV_F_1TB_FD)) != 0; } /* Set the features advertised by 'netdev' to 'advertise'. Returns 0 if * successful, otherwise a positive errno value. */ int -netdev_set_advertisements(struct netdev *netdev, uint32_t advertise) +netdev_set_advertisements(struct netdev *netdev, + enum netdev_features advertise) { return (netdev_get_dev(netdev)->netdev_class->set_advertisements ? netdev_get_dev(netdev)->netdev_class->set_advertisements( @@ -662,7 +690,7 @@ netdev_set_advertisements(struct netdev *netdev, uint32_t advertise) * * - EOPNOTSUPP: No IPv4 network stack attached to 'netdev'. * - * 'address' or 'netmask' or both may be null, in which case the address or + * 'address' or 'netmask' or both may be null, in which case the address or * netmask is not reported. */ int netdev_get_in4(const struct netdev *netdev, @@ -696,6 +724,26 @@ netdev_set_in4(struct netdev *netdev, struct in_addr addr, struct in_addr mask) : EOPNOTSUPP); } +/* Obtains ad IPv4 address from device name and save the address in + * in4. Returns 0 if successful, otherwise a positive errno value. + */ +int +netdev_get_in4_by_name(const char *device_name, struct in_addr *in4) +{ + struct netdev *netdev; + int error; + + error = netdev_open(device_name, "system", &netdev); + if (error) { + in4->s_addr = htonl(0); + return error; + } + + error = netdev_get_in4(netdev, in4, NULL); + netdev_close(netdev); + return error; +} + /* Adds 'router' as a default IP gateway for the TCP/IP stack that corresponds * to 'netdev'. */ int @@ -730,18 +778,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_status(const struct netdev *netdev, struct shash *sh) +netdev_get_status(const struct netdev *netdev, struct smap *smap) { struct netdev_dev *dev = netdev_get_dev(netdev); return (dev->netdev_class->get_status - ? dev->netdev_class->get_status(netdev, sh) + ? dev->netdev_class->get_status(netdev, smap) : EOPNOTSUPP); } @@ -813,7 +861,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); } @@ -896,6 +944,15 @@ netdev_get_carrier(const struct netdev *netdev) return carrier; } +/* Returns the number of times 'netdev''s carrier has changed. */ +long long int +netdev_get_carrier_resets(const struct netdev *netdev) +{ + return (netdev_get_dev(netdev)->netdev_class->get_carrier_resets + ? netdev_get_dev(netdev)->netdev_class->get_carrier_resets(netdev) + : 0); +} + /* Attempts to force netdev_get_carrier() to poll 'netdev''s MII registers for * link status instead of checking 'netdev''s carrier. 'netdev''s MII * registers will be polled once ever 'interval' milliseconds. If 'netdev' @@ -1027,10 +1084,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'. * @@ -1040,7 +1096,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; @@ -1049,7 +1105,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 { @@ -1079,7 +1135,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; @@ -1089,7 +1145,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); @@ -1109,12 +1165,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; @@ -1123,7 +1179,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; } @@ -1142,7 +1198,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 @@ -1197,7 +1253,11 @@ netdev_get_queue_stats(const struct netdev *netdev, unsigned int queue_id, * Calling this function may be more efficient than calling netdev_get_queue() * for every queue. * - * 'cb' must not modify or free the 'details' argument passed in. + * 'cb' must not modify or free the 'details' argument passed in. It may + * delete or modify the queue passed in as its 'queue_id' argument. It may + * modify but must not delete any other queue within 'netdev'. 'cb' should not + * add new queues because this may cause some queues to be visited twice or not + * at all. * * Returns 0 if successful, otherwise a positive errno value. On error, some * configured queues may not have been included in the iteration. */ @@ -1245,76 +1305,24 @@ netdev_change_seq(const struct netdev *netdev) { return netdev_get_dev(netdev)->netdev_class->change_seq(netdev); } - -/* If 'netdev' is a VLAN network device (e.g. one created with vconfig(8)), - * sets '*vlan_vid' to the VLAN VID associated with that device and returns 0. - * Otherwise returns a errno value (specifically ENOENT if 'netdev_name' is the - * name of a network device that is not a VLAN device) and sets '*vlan_vid' to - * -1. */ -int -netdev_get_vlan_vid(const struct netdev *netdev, int *vlan_vid) -{ - int error = (netdev_get_dev(netdev)->netdev_class->get_vlan_vid - ? netdev_get_dev(netdev)->netdev_class->get_vlan_vid(netdev, - vlan_vid) - : ENOENT); - if (error) { - *vlan_vid = 0; - } - return error; -} - -/* Returns a network device that has 'in4' as its IP address, if one exists, - * otherwise a null pointer. */ -struct netdev * -netdev_find_dev_by_in4(const struct in_addr *in4) -{ - struct netdev *netdev; - struct sset dev_list = SSET_INITIALIZER(&dev_list); - const char *name; - - netdev_enumerate(&dev_list); - SSET_FOR_EACH (name, &dev_list) { - struct in_addr dev_in4; - - if (!netdev_open_default(name, &netdev) - && !netdev_get_in4(netdev, &dev_in4, NULL) - && dev_in4.s_addr == in4->s_addr) { - goto exit; - } - netdev_close(netdev); - } - netdev = NULL; - -exit: - sset_destroy(&dev_list); - return netdev; -} /* Initializes 'netdev_dev' as a netdev device named 'name' of the specified * 'netdev_class'. This function is ordinarily called from a netdev provider's * 'create' function. * - * 'args' should be the arguments that were passed to the netdev provider's - * 'create'. If an empty set of arguments was passed, and 'name' is the name - * of a network device that existed before the 'create' call, then 'args' may - * instead be the configuration for that existing device. - * * This function adds 'netdev_dev' to a netdev-owned shash, so it is * very important that 'netdev_dev' only be freed after calling * the refcount drops to zero. */ void netdev_dev_init(struct netdev_dev *netdev_dev, const char *name, - const struct shash *args, const struct netdev_class *netdev_class) { - assert(!shash_find(&netdev_dev_shash, name)); + ovs_assert(!shash_find(&netdev_dev_shash, name)); memset(netdev_dev, 0, sizeof *netdev_dev); netdev_dev->netdev_class = netdev_class; netdev_dev->name = xstrdup(name); netdev_dev->node = shash_add(&netdev_dev_shash, name, netdev_dev); - smap_clone(&netdev_dev->args, args); } /* Undoes the results of initialization. @@ -1329,10 +1337,9 @@ netdev_dev_uninit(struct netdev_dev *netdev_dev, bool destroy) { char *name = netdev_dev->name; - assert(!netdev_dev->ref_cnt); + ovs_assert(!netdev_dev->ref_cnt); shash_delete(&netdev_dev_shash, netdev_dev->node); - smap_destroy(&netdev_dev->args); if (destroy) { netdev_dev->netdev_class->destroy(netdev_dev); @@ -1392,19 +1399,6 @@ netdev_dev_get_devices(const struct netdev_class *netdev_class, } } -/* Returns true if 'args' is equivalent to the "args" field in - * 'netdev_dev', otherwise false. */ -bool -netdev_dev_args_equal(const struct netdev_dev *netdev_dev, - const struct shash *args) -{ - if (netdev_dev->netdev_class->config_equal) { - return netdev_dev->netdev_class->config_equal(netdev_dev, args); - } else { - return smap_equal(&netdev_dev->args, args); - } -} - /* Initializes 'netdev' as a instance of the netdev_dev. * * This function adds 'netdev' to a netdev-owned linked list, so it is very