ofpbuf: Rename 'data_delta' to 'xxx_offset'

[cascardo/ovs.git] / datapath / dp_notify.c

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 0b22d0c..424f35d 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;
-       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)) {
-               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;
        }
 
-       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);
 }
 
@@ -60,13 +60,10 @@ void ovs_dp_notify_wq(struct work_struct *work)
                        struct hlist_node *n;
 
                        hlist_for_each_entry_safe(vport, n, &dp->ports[i], dp_hash_node) {
-                               struct netdev_vport *netdev_vport;
-
-                               if (vport->ops->type != OVS_VPORT_TYPE_NETDEV)
+                               if (vport->ops->type == OVS_VPORT_TYPE_INTERNAL)
                                        continue;
 
-                               netdev_vport = netdev_vport_priv(vport);
-                               if (!(ovs_netdev_get_vport(netdev_vport->dev)))
+                               if (!(vport->dev->priv_flags & IFF_OVS_DATAPATH))
                                        dp_detach_port_notify(vport);
                        }
                }