OSDN Git Service

openvswitch: use PTR_ERR_OR_ZERO
authorFabian Frederick <fabf@skynet.be>
Fri, 14 Nov 2014 18:32:58 +0000 (19:32 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 Nov 2014 19:41:39 +0000 (14:41 -0500)
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/openvswitch/flow_netlink.c

index c0d066d..c8fccdd 100644 (file)
@@ -1425,10 +1425,8 @@ static int add_action(struct sw_flow_actions **sfa, int attrtype,
        struct nlattr *a;
 
        a = __add_action(sfa, attrtype, data, len, log);
-       if (IS_ERR(a))
-               return PTR_ERR(a);
 
-       return 0;
+       return PTR_ERR_OR_ZERO(a);
 }
 
 static inline int add_nested_action_start(struct sw_flow_actions **sfa,