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
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
datapath
/
dp_notify.c
diff --git
a/datapath/dp_notify.c
b/datapath/dp_notify.c
index
b7aac4e
..
f9a0375
100644
(file)
--- a/
datapath/dp_notify.c
+++ b/
datapath/dp_notify.c
@@
-31,18
+31,18
@@
static void dp_detach_port_notify(struct vport *vport)
struct datapath *dp;
dp = vport->dp;
struct datapath *dp;
dp = vport->dp;
- notify = ovs_vport_cmd_build_info(vport, 0, 0,
- OVS_VPORT_CMD_DEL);
+ notify = ovs_vport_cmd_build_info(vport, 0, 0, OVS_VPORT_CMD_DEL);
ovs_dp_detach_port(vport);
if (IS_ERR(notify)) {
ovs_dp_detach_port(vport);
if (IS_ERR(notify)) {
-
netlink_set_err(ovs_dp_get_net(dp)->genl_sock
, 0,
-
ovs_dp_vport_multicast_group.id
,
-
PTR_ERR(notify));
+
genl_set_err(&dp_vport_genl_family, ovs_dp_get_net(dp)
, 0,
+
GROUP_ID(&ovs_dp_vport_multicast_group)
,
+ PTR_ERR(notify));
return;
}
return;
}
- genlmsg_multicast_netns(ovs_dp_get_net(dp), notify, 0,
- ovs_dp_vport_multicast_group.id,
+ genlmsg_multicast_netns(&dp_vport_genl_family,
+ ovs_dp_get_net(dp), notify, 0,
+ GROUP_ID(&ovs_dp_vport_multicast_group),
GFP_KERNEL);
}
GFP_KERNEL);
}
@@
-78,7
+78,7
@@
static int dp_device_event(struct notifier_block *unused, unsigned long event,
void *ptr)
{
struct ovs_net *ovs_net;
void *ptr)
{
struct ovs_net *ovs_net;
- struct net_device *dev =
ptr
;
+ struct net_device *dev =
netdev_notifier_info_to_dev(ptr)
;
struct vport *vport = NULL;
if (!ovs_is_internal_dev(dev))
struct vport *vport = NULL;
if (!ovs_is_internal_dev(dev))