datapath: hlist: drop the node parameter from iterators

[sliver-openvswitch.git] / datapath / vport.c

diff --git a/datapath/vport.c b/datapath/vport.c
index 994df7e..012af59 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -39,13 +39,11 @@
 static const struct vport_ops *base_vport_ops_list[] = {
        &ovs_netdev_vport_ops,
        &ovs_internal_vport_ops,
-       &ovs_patch_vport_ops,
        &ovs_gre_vport_ops,
-       &ovs_gre_ft_vport_ops,
        &ovs_gre64_vport_ops,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-       &ovs_capwap_vport_ops,
        &ovs_vxlan_vport_ops,
+       &ovs_lisp_vport_ops,
 #endif
 };
 
@@ -141,9 +139,8 @@ struct vport *ovs_vport_locate(struct net *net, const char *name)
 {
        struct hlist_head *bucket = hash_bucket(net, name);
        struct vport *vport;
-       struct hlist_node *node;
 
-       hlist_for_each_entry_rcu(vport, node, bucket, hash_node)
+       hlist_for_each_entry_rcu(vport, bucket, hash_node)
                if (!strcmp(name, vport->ops->get_name(vport)) &&
                    net_eq(ovs_dp_get_net(vport->dp), net))
                        return vport;