projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "citrix" branch into "master".
[openvswitch]
/
lib
/
netdev.c
diff --git
a/lib/netdev.c
b/lib/netdev.c
index ddd6e92ceed5a0722b16dd542242c0f106c31a14..2c7b260e1234544857083492e0a42b68b1ff3eba 100644
(file)
--- a/
lib/netdev.c
+++ b/
lib/netdev.c
@@
-59,7
+59,7
@@
static struct list netdev_list = LIST_INITIALIZER(&netdev_list);
* additional log messages. */
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
* additional log messages. */
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
-static void close_all_netdevs(void *aux UNUSED);
+static void close_all_netdevs(void *aux
OVS_
UNUSED);
static int restore_flags(struct netdev *netdev);
void update_device_args(struct netdev_dev *, const struct shash *args);
static int restore_flags(struct netdev *netdev);
void update_device_args(struct netdev_dev *, const struct shash *args);
@@
-89,9
+89,9
@@
netdev_run(void)
{
struct shash_node *node;
SHASH_FOR_EACH(node, &netdev_classes) {
{
struct shash_node *node;
SHASH_FOR_EACH(node, &netdev_classes) {
- const struct netdev_class *class = node->data;
- if (class->run) {
- class->run();
+ const struct netdev_class *
netdev_
class = node->data;
+ if (
netdev_
class->run) {
+
netdev_
class->run();
}
}
}
}
}
}
@@
-105,9
+105,9
@@
netdev_wait(void)
{
struct shash_node *node;
SHASH_FOR_EACH(node, &netdev_classes) {
{
struct shash_node *node;
SHASH_FOR_EACH(node, &netdev_classes) {
- const struct netdev_class *class = node->data;
- if (class->wait) {
- class->wait();
+ const struct netdev_class *
netdev_
class = node->data;
+ if (
netdev_
class->wait) {
+
netdev_
class->wait();
}
}
}
}
}
}
@@
-975,12
+975,12
@@
exit:
* the refcount drops to zero. */
void
netdev_dev_init(struct netdev_dev *netdev_dev, const char *name,
* the refcount drops to zero. */
void
netdev_dev_init(struct netdev_dev *netdev_dev, const char *name,
- const struct netdev_class *
class_
)
+ const struct netdev_class *
netdev_class
)
{
assert(!shash_find(&netdev_dev_shash, name));
memset(netdev_dev, 0, sizeof *netdev_dev);
{
assert(!shash_find(&netdev_dev_shash, name));
memset(netdev_dev, 0, sizeof *netdev_dev);
- netdev_dev->netdev_class =
class_
;
+ netdev_dev->netdev_class =
netdev_class
;
netdev_dev->name = xstrdup(name);
netdev_dev->node = shash_add(&netdev_dev_shash, name, netdev_dev);
}
netdev_dev->name = xstrdup(name);
netdev_dev->node = shash_add(&netdev_dev_shash, name, netdev_dev);
}
@@
-1035,19
+1035,19
@@
netdev_dev_from_name(const char *name)
return shash_find_data(&netdev_dev_shash, name);
}
return shash_find_data(&netdev_dev_shash, name);
}
-/* Fills 'device_list' with devices that match 'class'.
+/* Fills 'device_list' with devices that match '
netdev_
class'.
*
* The caller is responsible for initializing and destroying 'device_list'
* but the contained netdev_devs must not be freed. */
void
*
* The caller is responsible for initializing and destroying 'device_list'
* but the contained netdev_devs must not be freed. */
void
-netdev_dev_get_devices(const struct netdev_class *
class_
,
+netdev_dev_get_devices(const struct netdev_class *
netdev_class
,
struct shash *device_list)
{
struct shash_node *node;
SHASH_FOR_EACH (node, &netdev_dev_shash) {
struct netdev_dev *dev = node->data;
struct shash *device_list)
{
struct shash_node *node;
SHASH_FOR_EACH (node, &netdev_dev_shash) {
struct netdev_dev *dev = node->data;
- if (dev->netdev_class ==
class_
) {
+ if (dev->netdev_class ==
netdev_class
) {
shash_add(device_list, node->name, node->data);
}
}
shash_add(device_list, node->name, node->data);
}
}
@@
-1265,7
+1265,7
@@
restore_flags(struct netdev *netdev)
/* Close all netdevs on shutdown so they can do any needed cleanup such as
* destroying devices, restoring flags, etc. */
static void
/* Close all netdevs on shutdown so they can do any needed cleanup such as
* destroying devices, restoring flags, etc. */
static void
-close_all_netdevs(void *aux UNUSED)
+close_all_netdevs(void *aux
OVS_
UNUSED)
{
struct netdev *netdev, *next;
LIST_FOR_EACH_SAFE(netdev, next, struct netdev, node, &netdev_list) {
{
struct netdev *netdev, *next;
LIST_FOR_EACH_SAFE(netdev, next, struct netdev, node, &netdev_list) {