projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: s/ODPAT_/ODP_ACTION_ATTR_/ to fit new naming scheme.
[openvswitch]
/
vswitchd
/
proc-net-compat.c
diff --git
a/vswitchd/proc-net-compat.c
b/vswitchd/proc-net-compat.c
index 0eda6d2584409320d9e2bc31b5e7c576ac4b4c66..3b7596ad91b59a79d539b27ea319f4a51788ba3a 100644
(file)
--- a/
vswitchd/proc-net-compat.c
+++ b/
vswitchd/proc-net-compat.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010
, 2011
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.
@@
-25,6
+25,7
@@
#include "dynamic-string.h"
#include "hash.h"
#include "netlink-protocol.h"
#include "dynamic-string.h"
#include "hash.h"
#include "netlink-protocol.h"
+#include "netlink-socket.h"
#include "netlink.h"
#include "ofpbuf.h"
#include "openvswitch/brcompat-netlink.h"
#include "netlink.h"
#include "ofpbuf.h"
#include "openvswitch/brcompat-netlink.h"
@@
-33,7
+34,7
@@
#include "svec.h"
#include "vlog.h"
#include "svec.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(proc_net_compat)
+VLOG_DEFINE_THIS_MODULE(proc_net_compat)
;
/* Netlink socket to bridge compatibility kernel module. */
static struct nl_sock *brc_sock;
/* Netlink socket to bridge compatibility kernel module. */
static struct nl_sock *brc_sock;
@@
-58,7
+59,7
@@
proc_net_compat_init(void)
return retval;
}
return retval;
}
- retval = nl_sock_create(NETLINK_GENERIC,
0, 0, 0,
&brc_sock);
+ retval = nl_sock_create(NETLINK_GENERIC, &brc_sock);
if (retval) {
return retval;
}
if (retval) {
return retval;
}