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
Do not forward multicast addresses that must not be, in learning-switch.
[sliver-openvswitch.git]
/
lib
/
vconn-netlink.c
diff --git
a/lib/vconn-netlink.c
b/lib/vconn-netlink.c
index
22a8f61
..
a0fcc8d
100644
(file)
--- a/
lib/vconn-netlink.c
+++ b/
lib/vconn-netlink.c
@@
-46,8
+46,8
@@
#include "dpif.h"
#include "netlink.h"
#include "ofpbuf.h"
#include "dpif.h"
#include "netlink.h"
#include "ofpbuf.h"
-#include "openflow-netlink.h"
-#include "openflow.h"
+#include "openflow
/openflow
-netlink.h"
+#include "openflow
/openflow
.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "util.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "util.h"
@@
-65,7
+65,7
@@
struct netlink_vconn
static struct netlink_vconn *
netlink_vconn_cast(struct vconn *vconn)
{
static struct netlink_vconn *
netlink_vconn_cast(struct vconn *vconn)
{
-
assert(vconn->class ==
&netlink_vconn_class);
+
vconn_assert_class(vconn,
&netlink_vconn_class);
return CONTAINER_OF(vconn, struct netlink_vconn, vconn);
}
return CONTAINER_OF(vconn, struct netlink_vconn, vconn);
}
@@
-142,10
+142,11
@@
netlink_wait(struct vconn *vconn, enum vconn_wait_type wait)
}
struct vconn_class netlink_vconn_class = {
}
struct vconn_class netlink_vconn_class = {
- .name = "nl",
- .open = netlink_open,
- .close = netlink_close,
- .recv = netlink_recv,
- .send = netlink_send,
- .wait = netlink_wait,
+ "nl", /* name */
+ netlink_open, /* open */
+ netlink_close, /* close */
+ NULL, /* connect */
+ netlink_recv, /* recv */
+ netlink_send, /* send */
+ netlink_wait, /* wait */
};
};