Skip to contentSkip to conversation

net/ipv4: Use IS_ERR_OR_NULL

PATCH Applied Himangi Saraogi 2 participants 2 messages Jul 27, 2014 – Jul 29, 2014

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Himangi Saraogi

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Acked-by Julia Lawall <[email protected]>
---
 net/ipv4/gre_offload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/gre_offload.c +1 -1
index f0bdd47..6556263 100644
@@ -74,7 +74,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
 	/* segment inner packet. */
 	enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
 	segs = skb_mac_gso_segment(skb, enc_features);
-	if (!segs || IS_ERR(segs)) {
+	if (IS_ERR_OR_NULL(segs)) {
 		skb_gso_error_unwind(skb, protocol, ghl, mac_offset, mac_len);
 		goto out;
 	}
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw

From: Himangi Saraogi <[email protected]>
Date: Sun, 27 Jul 2014 12:36:51 +0530

Quoted 9 lines

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;
@@

Quoted 6 lines

- e == NULL || IS_ERR(e)
+ IS_ERR_OR_NULL(e)
|| ...

Signed-off-by Himangi Saraogi <[email protected]>
Acked-by Julia Lawall <[email protected]>

Applied.