diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-22 01:32:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-22 14:28:28 -0500 |
commit | 50c3a487d507568359ccbce1b15bcdfc01edf7ef (patch) | |
tree | 78d3978bde268dabbdc92c3ce25ccb3fcf95e4b5 /net | |
parent | 8fbcec241df21d1ba2aba09974ea9017832b69b0 (diff) |
ipv4: Use IS_ERR_OR_NULL().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/af_inet.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 2 | ||||
-rw-r--r-- | net/ipv4/udp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 4fdf96710d45..4b7053919976 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1333,7 +1333,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb, | |||
1333 | segs = ops->callbacks.gso_segment(skb, features); | 1333 | segs = ops->callbacks.gso_segment(skb, features); |
1334 | rcu_read_unlock(); | 1334 | rcu_read_unlock(); |
1335 | 1335 | ||
1336 | if (!segs || IS_ERR(segs)) | 1336 | if (IS_ERR_OR_NULL(segs)) |
1337 | goto out; | 1337 | goto out; |
1338 | 1338 | ||
1339 | skb = segs; | 1339 | skb = segs; |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 2aa69c8ae60c..52271947a471 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -3243,7 +3243,7 @@ __tcp_alloc_md5sig_pool(struct sock *sk) | |||
3243 | struct crypto_hash *hash; | 3243 | struct crypto_hash *hash; |
3244 | 3244 | ||
3245 | hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC); | 3245 | hash = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC); |
3246 | if (!hash || IS_ERR(hash)) | 3246 | if (IS_ERR_OR_NULL(hash)) |
3247 | goto out_free; | 3247 | goto out_free; |
3248 | 3248 | ||
3249 | per_cpu_ptr(pool, cpu)->md5_desc.tfm = hash; | 3249 | per_cpu_ptr(pool, cpu)->md5_desc.tfm = hash; |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 79c8dbe59b54..cf6158f1f46b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -971,7 +971,7 @@ back_from_confirm: | |||
971 | sizeof(struct udphdr), &ipc, &rt, | 971 | sizeof(struct udphdr), &ipc, &rt, |
972 | msg->msg_flags); | 972 | msg->msg_flags); |
973 | err = PTR_ERR(skb); | 973 | err = PTR_ERR(skb); |
974 | if (skb && !IS_ERR(skb)) | 974 | if (!IS_ERR_OR_NULL(skb)) |
975 | err = udp_send_skb(skb, fl4); | 975 | err = udp_send_skb(skb, fl4); |
976 | goto out; | 976 | goto out; |
977 | } | 977 | } |