Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/jesse/openvswitch
mrcsosa · Sep 4, 2012 · cefd81c · cefd81c
2 parents 3731a33 + 15eac2a
commit cefd81c
Show file tree

Hide file tree

Showing 10 changed files with 317 additions and 171 deletions.
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
@@ -266,7 +266,7 @@ static int do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 	if (unlikely(!skb))
 		return -ENOMEM;
 
-	vport = rcu_dereference(dp->ports[out_port]);
+	vport = ovs_vport_rcu(dp, out_port);
 	if (unlikely(!vport)) {
 		kfree_skb(skb);
 		return -ENODEV;