git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: omit _mod from module names
[sliver-openvswitch.git]
/
vswitchd
/
ovs-brcompatd.c
diff --git
a/vswitchd/ovs-brcompatd.c
b/vswitchd/ovs-brcompatd.c
index
f42f01b
..
18a6708
100644
(file)
--- a/
vswitchd/ovs-brcompatd.c
+++ b/
vswitchd/ovs-brcompatd.c
@@
-28,6
+28,7
@@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/stat.h>
#include <time.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <time.h>
#include <fcntl.h>
@@
-455,7
+456,7
@@
handle_fdb_query_cmd(struct ofpbuf *buffer)
uint32_t seq;
int error;
uint32_t seq;
int error;
- /* Parse the command received from brcompat
_mod
. */
+ /* Parse the command received from brcompat. */
error = parse_command(buffer, &seq, &linux_name, NULL, &count, &skip);
if (error) {
return error;
error = parse_command(buffer, &seq, &linux_name, NULL, &count, &skip);
if (error) {
return error;
@@
-724,7
+725,7
@@
brc_recv_update(void)
* (XenServer Tools 5.5.0 does not exhibit this behavior, and neither does
* a VM without Tools installed at all.)
*/
* (XenServer Tools 5.5.0 does not exhibit this behavior, and neither does
* a VM without Tools installed at all.)
*/
- rtnetlink_link_
notifier_
run();
+ rtnetlink_link_run();
switch (genlmsghdr->cmd) {
case BRC_GENL_C_DP_ADD:
switch (genlmsghdr->cmd) {
case BRC_GENL_C_DP_ADD:
@@
-790,7
+791,7
@@
netdev_changed_cb(const struct rtnetlink_link_change *change,
port_name, br_name);
run_vsctl(vsctl_program, VSCTL_OPTIONS,
port_name, br_name);
run_vsctl(vsctl_program, VSCTL_OPTIONS,
- "--", "--if-exists", "del-port",
br_name,
port_name,
+ "--", "--if-exists", "del-port", port_name,
"--", "comment", "ovs-brcompatd:", port_name, "disappeared",
(char *) NULL);
}
"--", "comment", "ovs-brcompatd:", port_name, "disappeared",
(char *) NULL);
}
@@
-799,7
+800,7
@@
int
main(int argc, char *argv[])
{
extern struct vlog_module VLM_reconnect;
main(int argc, char *argv[])
{
extern struct vlog_module VLM_reconnect;
- struct
rtnetlink_notifier
link_notifier;
+ struct
nln_notifier *
link_notifier;
struct unixctl_server *unixctl;
int retval;
struct unixctl_server *unixctl;
int retval;
@@
-823,26
+824,25
@@
main(int argc, char *argv[])
"\"brcompat\" kernel module.");
}
"\"brcompat\" kernel module.");
}
-
- rtnetlink_link_notifier_register(&link_notifier, netdev_changed_cb, NULL);
+ link_notifier = rtnetlink_link_notifier_create(netdev_changed_cb, NULL);
daemonize_complete();
for (;;) {
unixctl_server_run(unixctl);
daemonize_complete();
for (;;) {
unixctl_server_run(unixctl);
- rtnetlink_link_
notifier_
run();
+ rtnetlink_link_run();
brc_recv_update();
netdev_run();
nl_sock_wait(brc_sock, POLLIN);
unixctl_server_wait(unixctl);
brc_recv_update();
netdev_run();
nl_sock_wait(brc_sock, POLLIN);
unixctl_server_wait(unixctl);
- rtnetlink_link_
notifier_
wait();
+ rtnetlink_link_wait();
netdev_wait();
poll_block();
}
netdev_wait();
poll_block();
}
- rtnetlink_link_notifier_
unregister(&
link_notifier);
+ rtnetlink_link_notifier_
destroy(
link_notifier);
return 0;
}
return 0;
}