1 files changed, 17 insertions, 10 deletions

diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 6140336e79d7..03779e8a2622 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -16,10 +16,10 @@
  * 02110-1301, USA
  */
 
-#include <linux/dcache.h>
 #include <linux/etherdevice.h>
 #include <linux/if.h>
 #include <linux/if_vlan.h>
+#include <linux/jhash.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
@@ -27,7 +27,9 @@
 #include <linux/rcupdate.h>
 #include <linux/rtnetlink.h>
 #include <linux/compat.h>
+#include <net/net_namespace.h>
 
+#include "datapath.h"
 #include "vport.h"
 #include "vport-internal_dev.h"
 
@@ -67,9 +69,9 @@ void ovs_vport_exit(void)
         kfree(dev_table);
 }
 
-static struct hlist_head *hash_bucket(const char *name)
+static struct hlist_head *hash_bucket(struct net *net, const char *name)
 {
-        unsigned int hash = full_name_hash(name, strlen(name));
+        unsigned int hash = jhash(name, strlen(name), (unsigned long) net);
         return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)];
 }
 
@@ -80,14 +82,15 @@ static struct hlist_head *hash_bucket(const char *name)
  *
  * Must be called with RTNL or RCU read lock.
  */
-struct vport *ovs_vport_locate(const char *name)
+struct vport *ovs_vport_locate(struct net *net, const char *name)
 {
-        struct hlist_head *bucket = hash_bucket(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)
-                if (!strcmp(name, vport->ops->get_name(vport)))
+                if (!strcmp(name, vport->ops->get_name(vport)) &&
+                    net_eq(ovs_dp_get_net(vport->dp), net))
                         return vport;
 
         return NULL;
@@ -122,8 +125,9 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,
 
         vport->dp = parms->dp;
         vport->port_no = parms->port_no;
-        vport->upcall_pid = parms->upcall_pid;
+        vport->upcall_portid = parms->upcall_portid;
         vport->ops = ops;
+        INIT_HLIST_NODE(&vport->dp_hash_node);
 
         vport->percpu_stats = alloc_percpu(struct vport_percpu_stats);
         if (!vport->percpu_stats) {
@@ -170,14 +174,17 @@ struct vport *ovs_vport_add(const struct vport_parms *parms)
 
         for (i = 0; i < ARRAY_SIZE(vport_ops_list); i++) {
                 if (vport_ops_list[i]->type == parms->type) {
+                        struct hlist_head *bucket;
+
                         vport = vport_ops_list[i]->create(parms);
                         if (IS_ERR(vport)) {
                                 err = PTR_ERR(vport);
                                 goto out;
                         }
 
-                        hlist_add_head_rcu(&vport->hash_node,
-                                           hash_bucket(vport->ops->get_name(vport)));
+                        bucket = hash_bucket(ovs_dp_get_net(vport->dp),
+                                             vport->ops->get_name(vport));
+                        hlist_add_head_rcu(&vport->hash_node, bucket);
                         return vport;
                 }
         }
@@ -391,7 +398,7 @@ void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)
         case VPORT_E_TX_ERROR:
                 vport->err_stats.tx_errors++;
                 break;
-        };
+        }
 
         spin_unlock(&vport->stats_lock);
 }