aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHimangi Saraogi <himangi774@gmail.com>2014-07-27 03:08:38 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-29 18:31:56 -0400
commit27446442a810f29d0fa97356bbc11f45e7ecfa6e (patch)
tree7cc5bbe5e18ff7dd45ae40e150f31dd10bade545 /net
parentd0e992aa0270663872c56f07473a7f43adee5bd5 (diff)
net/udp_offload: 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')
-rw-r--r--net/ipv4/udp_offload.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 4807544d018b..59035bc3008d 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -79,7 +79,7 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,
79 /* segment inner packet. */ 79 /* segment inner packet. */
80 enc_features = skb->dev->hw_enc_features & netif_skb_features(skb); 80 enc_features = skb->dev->hw_enc_features & netif_skb_features(skb);
81 segs = skb_mac_gso_segment(skb, enc_features); 81 segs = skb_mac_gso_segment(skb, enc_features);
82 if (!segs || IS_ERR(segs)) { 82 if (IS_ERR_OR_NULL(segs)) {
83 skb_gso_error_unwind(skb, protocol, tnl_hlen, mac_offset, 83 skb_gso_error_unwind(skb, protocol, tnl_hlen, mac_offset,
84 mac_len); 84 mac_len);
85 goto out; 85 goto out;