ipv4: Use IS_ERR_OR_NULL().

PATCH In review YOSHIFUJI Hideaki 1 participant 1 message Jan 22, 2013

Subsystems (4)

Networking Network drivers TCP UDP

lore

Share & tools

lore

YOSHIFUJI Hideaki

author

2013-01-22 16:32 UTC #0 lore raw

PATCH 2/4 ipv4: Use IS_ERR_OR_NULL().

Signed-off-by YOSHIFUJI Hideaki <[email protected]>

---
 net/ipv4/af_inet.c |    2 +-
 net/ipv4/tcp.c     |    2 +-
 net/ipv4/udp.c     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

net/ipv4/af_inet.c +1 -1

index 4fdf967..4b70539 100644
@@ -1333,7 +1333,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
 		segs = ops->callbacks.gso_segment(skb, features);
 	rcu_read_unlock();
 
-	if (!segs || IS_ERR(segs))
+	if (IS_ERR_OR_NULL(segs))
 		goto out;
 
 	skb = segs;

net/ipv4/tcp.c +1 -1

index 2aa69c8..5227194 100644
@@ -3243,7 +3243,7 @@ __tcp_alloc_md5sig_pool(struct sock *sk)
 		struct crypto_hash *hash;
 
 		hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
-		if (!hash || IS_ERR(hash))
+		if (IS_ERR_OR_NULL(hash))
 			goto out_free;
 
 		per_cpu_ptr(pool, cpu)->md5_desc.tfm = hash;

net/ipv4/udp.c +1 -1

index 79c8dbe..cf6158f 100644
@@ -971,7 +971,7 @@ back_from_confirm:
 				  sizeof(struct udphdr), &ipc, &rt,
 				  msg->msg_flags);
 		err = PTR_ERR(skb);
-		if (skb && !IS_ERR(skb))
+		if (!IS_ERR_OR_NULL(skb))
 			err = udp_send_skb(skb, fl4);
 		goto out;
 	}

Signature · 1 line

1.7.9.5