1 files changed, 4 insertions, 4 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index f3f96badf5a..08114478cb8 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -45,7 +45,7 @@ static int make_writable(struct sk_buff *skb, int write_len)
         return pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
 }
 
-/* remove VLAN header from packet and update csum accrodingly. */
+/* remove VLAN header from packet and update csum accordingly. */
 static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci)
 {
         struct vlan_hdr *vhdr;
@@ -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;
@@ -286,7 +286,7 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
         upcall.cmd = OVS_PACKET_CMD_ACTION;
         upcall.key = &OVS_CB(skb)->flow->key;
         upcall.userdata = NULL;
-        upcall.pid = 0;
+        upcall.portid = 0;
 
         for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
                  a = nla_next(a, &rem)) {
@@ -296,7 +296,7 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb,
                         break;
 
                 case OVS_USERSPACE_ATTR_PID:
-                        upcall.pid = nla_get_u32(a);
+                        upcall.portid = nla_get_u32(a);
                         break;
                 }
         }