python: Avoid shadowing standard or global names.

[openvswitch] / datapath / actions.c

diff --git a/datapath/actions.c b/datapath/actions.c
index 83b531adfff3143fc29e59f2515527aea804c732..32e44c040ff930ab94340efd617bb1f87f5d225b 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -227,22 +227,21 @@ static int set_tp_port(struct sk_buff *skb, const struct nlattr *a)
        return 0;
 }
 
-static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
+static int do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 {
-       struct vport *p;
+       struct vport *vport;
 
-       if (!skb)
-               goto error;
-
-       p = rcu_dereference(dp->ports[out_port]);
-       if (!p)
-               goto error;
+       if (unlikely(!skb))
+               return -ENOMEM;
 
-       vport_send(p, skb);
-       return;
+       vport = rcu_dereference(dp->ports[out_port]);
+       if (unlikely(!vport)) {
+               kfree_skb(skb);
+               return -ENODEV;
+       }
 
-error:
-       kfree_skb(skb);
+       vport_send(vport, skb);
+       return 0;
 }
 
 static int output_userspace(struct datapath *dp, struct sk_buff *skb, u64 arg)
@@ -290,7 +289,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
                        break;
 
                case OVS_ACTION_ATTR_USERSPACE:
-                       err = output_userspace(dp, skb, nla_get_u64(a));
+                       output_userspace(dp, skb, nla_get_u64(a));
                        break;
 
                case OVS_ACTION_ATTR_SET_TUNNEL: