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: Cleanup netlink compat code.
[sliver-openvswitch.git]
/
lib
/
dpif-linux.c
diff --git
a/lib/dpif-linux.c
b/lib/dpif-linux.c
index
1b97410
..
e2300d6
100644
(file)
--- a/
lib/dpif-linux.c
+++ b/
lib/dpif-linux.c
@@
-46,7
+46,6
@@
#include "netlink.h"
#include "odp-util.h"
#include "ofpbuf.h"
#include "netlink.h"
#include "odp-util.h"
#include "ofpbuf.h"
-#include "openvswitch/datapath-compat.h"
#include "packets.h"
#include "poll-loop.h"
#include "random.h"
#include "packets.h"
#include "poll-loop.h"
#include "random.h"
@@
-248,7
+247,7
@@
open_dpif(const struct dpif_linux_dp *dp, struct dpif **dpifp)
dpif = xzalloc(sizeof *dpif);
dpif->port_notifier = NULL;
dpif = xzalloc(sizeof *dpif);
dpif->port_notifier = NULL;
- ovs_mutex_init(&dpif->upcall_lock
, PTHREAD_MUTEX_DEFAULT
);
+ ovs_mutex_init(&dpif->upcall_lock);
dpif->epoll_fd = -1;
dpif_init(&dpif->dpif, &dpif_linux_class, dp->name,
dpif->epoll_fd = -1;
dpif_init(&dpif->dpif, &dpif_linux_class, dp->name,
@@
-655,10
+654,10
@@
dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname,
return dpif_linux_port_query__(dpif, 0, devname, dpif_port);
}
return dpif_linux_port_query__(dpif, 0, devname, dpif_port);
}
-static
odp_port
_t
+static
uint32
_t
dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED)
{
dpif_linux_get_max_ports(const struct dpif *dpif OVS_UNUSED)
{
- return
u32_to_odp(MAX_PORTS)
;
+ return
MAX_PORTS
;
}
static uint32_t
}
static uint32_t
@@
-1566,8
+1565,7
@@
dpif_linux_init(void)
}
if (!error) {
error = nl_lookup_genl_mcgroup(OVS_VPORT_FAMILY, OVS_VPORT_MCGROUP,
}
if (!error) {
error = nl_lookup_genl_mcgroup(OVS_VPORT_FAMILY, OVS_VPORT_MCGROUP,
- &ovs_vport_mcgroup,
- OVS_VPORT_MCGROUP_FALLBACK_ID);
+ &ovs_vport_mcgroup);
}
ovsthread_once_done(&once);
}
ovsthread_once_done(&once);