projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Use get_table_protected() in additional places.
[openvswitch]
/
utilities
/
nlmon.c
diff --git
a/utilities/nlmon.c
b/utilities/nlmon.c
index 1da026b02f624ec21eaef07c30647a762513f66a..1fb3808085f3f1f1ae48ea76fe6df649c97bf1b5 100644
(file)
--- a/
utilities/nlmon.c
+++ b/
utilities/nlmon.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,6
+24,7
@@
#include <stddef.h>
#include <linux/rtnetlink.h>
#include "netlink.h"
#include <stddef.h>
#include <linux/rtnetlink.h>
#include "netlink.h"
+#include "netlink-socket.h"
#include "ofpbuf.h"
#include "poll-loop.h"
#include "timeval.h"
#include "ofpbuf.h"
#include "poll-loop.h"
#include "timeval.h"
@@
-36,15
+37,13
@@
static const struct nl_policy rtnlgrp_link_policy[] = {
};
int
};
int
-main(int argc UNUSED, char *argv[])
+main(int argc
OVS_
UNUSED, char *argv[])
{
struct nl_sock *sock;
int error;
set_program_name(argv[0]);
{
struct nl_sock *sock;
int error;
set_program_name(argv[0]);
- time_init();
- vlog_init();
- vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_DBG);
+ vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_DBG);
error = nl_sock_create(NETLINK_ROUTE, RTNLGRP_LINK, 0, 0, &sock);
if (error) {
error = nl_sock_create(NETLINK_ROUTE, RTNLGRP_LINK, 0, 0, &sock);
if (error) {