mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

Don't shadow global VLOG "rl" definition.

Browse Source 
Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Justin Pettit
2018-02-27 10:44:13 -08:00
parent 1139c77dff
commit 7ed58d4a0d
7 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/netdev-linux.c
View File

@@ -635,7 +635,6 @@ netdev_linux_run(const struct netdev_class *netdev_class OVS_UNUSED)
}
do {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
uint64_t buf_stub[4096 / 8];
struct ofpbuf buf;
@@ -686,7 +685,8 @@ netdev_linux_run(const struct netdev_class *netdev_class OVS_UNUSED)
}
shash_destroy(&device_shash);
} else if (error != EAGAIN) {
VLOG_WARN_RL(&rl, "error reading or parsing netlink (%s)",
static struct vlog_rate_limit rll = VLOG_RATE_LIMIT_INIT(1, 5);
VLOG_WARN_RL(&rll, "error reading or parsing netlink (%s)",
ovs_strerror(error));
}
ofpbuf_uninit(&buf);
@@ -789,8 +789,8 @@ netdev_linux_common_construct(struct netdev *netdev_)
struct netdev_linux *netdev = netdev_linux_cast(netdev_);
const char *name = netdev_->name;
if (!strcmp(name, "default") || !strcmp(name, "all")) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
VLOG_WARN_RL(&rl, "%s: Linux forbids network device with this name",
static struct vlog_rate_limit rll = VLOG_RATE_LIMIT_INIT(1, 1);
VLOG_WARN_RL(&rll, "%s: Linux forbids network device with this name",
name);
return EINVAL;
}