diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2014-07-27 03:06:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-29 18:31:56 -0400 |
commit | 5a8dbf03ddf6dfe465b9f062e5b969f9606643f5 (patch) | |
tree | a7d6e731b363cb43d05b62d6b13a44867519d194 /net/ipv4/gre_offload.c | |
parent | 4984c23735132790e8f2dfdd35849dba3bd7264f (diff) |
net/ipv4: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre_offload.c')
-rw-r--r-- | net/ipv4/gre_offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c index f0bdd47bbbcb..6556263c8fa5 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c | |||
@@ -74,7 +74,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb, | |||
74 | /* segment inner packet. */ | 74 | /* segment inner packet. */ |
75 | enc_features = skb->dev->hw_enc_features & netif_skb_features(skb); | 75 | enc_features = skb->dev->hw_enc_features & netif_skb_features(skb); |
76 | segs = skb_mac_gso_segment(skb, enc_features); | 76 | segs = skb_mac_gso_segment(skb, enc_features); |
77 | if (!segs || IS_ERR(segs)) { | 77 | if (IS_ERR_OR_NULL(segs)) { |
78 | skb_gso_error_unwind(skb, protocol, ghl, mac_offset, mac_len); | 78 | skb_gso_error_unwind(skb, protocol, ghl, mac_offset, mac_len); |
79 | goto out; | 79 | goto out; |
80 | } | 80 | } |