aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-11-14 19:32:58 +0100
committerDavid S. Miller <davem@davemloft.net>2014-11-16 14:41:39 -0500
commitf35423c137b0e64155f52c166db1d13834a551f2 (patch)
treea102dfee6ee0e88ab4932d73aac8411499ff1afb /net/openvswitch
parenttipc: allow one link per bearer to neighboring nodes (diff)
downloadlinux-dev-f35423c137b0e64155f52c166db1d13834a551f2.tar.xz
linux-dev-f35423c137b0e64155f52c166db1d13834a551f2.zip
openvswitch: use PTR_ERR_OR_ZERO
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>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/flow_netlink.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index c0d066def228..c8fccdded865 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -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,