diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
| commit | cefd81cfeca14ec4c63cc748441634f1d4c0eb3f (patch) | |
| tree | b4541c563d40c4600e79319c2e98919caa19cede /net/openvswitch/actions.c | |
| parent | 3731a334c012ed825a87e1f152bbf980f79dabb2 (diff) | |
| parent | 15eac2a74277bc7de68a7c2a64a7c91b4b6f5961 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index f3f96badf5aa..0da687769f56 100644 --- 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; |