summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHimangi Saraogi <himangi774@gmail.com>2014-07-27 11:07:46 +0400
committerDavid S. Miller <davem@davemloft.net>2014-07-30 02:31:56 +0400
commitd0e992aa0270663872c56f07473a7f43adee5bd5 (patch)
tree9db3fe1d8ce95598ca8fdad98db9aa3551bab4df /net
parent5a8dbf03ddf6dfe465b9f062e5b969f9606643f5 (diff)
downloadlinux-d0e992aa0270663872c56f07473a7f43adee5bd5.tar.xz
openvswitch: Use IS_ERR_OR_NULL
This patch introduces the use of the macro IS_ERR_OR_NULL in place of tests for NULL and IS_ERR. The following Coccinelle semantic patch was used for making the change: @@ expression e; @@ - e == NULL || IS_ERR(e) + IS_ERR_OR_NULL(e) || ... Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Acked-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/openvswitch/datapath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 3c461e1e4554..7ad3f029baae 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -781,7 +781,7 @@ static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow,
skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts), info,
always);
- if (!skb || IS_ERR(skb))
+ if (IS_ERR_OR_NULL(skb))
return skb;
retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb,