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
bugtool: Uninstall plugins on "make uninstall".
[sliver-openvswitch.git]
/
vswitchd
/
ovs-brcompatd.c
diff --git
a/vswitchd/ovs-brcompatd.c
b/vswitchd/ovs-brcompatd.c
index
d9b3bc3
..
41187b1
100644
(file)
--- a/
vswitchd/ovs-brcompatd.c
+++ b/
vswitchd/ovs-brcompatd.c
@@
-43,13
+43,13
@@
#include "leak-checker.h"
#include "netdev.h"
#include "netlink.h"
#include "leak-checker.h"
#include "netdev.h"
#include "netlink.h"
+#include "netlink-notifier.h"
#include "netlink-socket.h"
#include "ofpbuf.h"
#include "openvswitch/brcompat-netlink.h"
#include "packets.h"
#include "poll-loop.h"
#include "process.h"
#include "netlink-socket.h"
#include "ofpbuf.h"
#include "openvswitch/brcompat-netlink.h"
#include "packets.h"
#include "poll-loop.h"
#include "process.h"
-#include "rtnetlink.h"
#include "rtnetlink-link.h"
#include "signals.h"
#include "sset.h"
#include "rtnetlink-link.h"
#include "signals.h"
#include "sset.h"
@@
-488,7
+488,7
@@
handle_fdb_query_cmd(struct ofpbuf *buffer)
struct mac *mac = &local_macs[n_local_macs];
struct netdev *netdev;
struct mac *mac = &local_macs[n_local_macs];
struct netdev *netdev;
- error = netdev_open
_default(iface_name
, &netdev);
+ error = netdev_open
(iface_name, "system"
, &netdev);
if (!error) {
if (!netdev_get_etheraddr(netdev, mac->addr)) {
n_local_macs++;
if (!error) {
if (!netdev_get_etheraddr(netdev, mac->addr)) {
n_local_macs++;
@@
-799,7
+799,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;
@@
-880,7
+880,6
@@
parse_options(int argc, char *argv[])
}
switch (c) {
}
switch (c) {
- case 'H':
case 'h':
usage();
case 'h':
usage();