aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/udp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r--net/ipv6/udp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 7fe0329c0d37..58efd2c5c127 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -550,7 +550,7 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
550 550
551 sk = __udp6_lib_lookup(net, daddr, uh->dest, 551 sk = __udp6_lib_lookup(net, daddr, uh->dest,
552 saddr, uh->source, inet6_iif(skb), udptable); 552 saddr, uh->source, inet6_iif(skb), udptable);
553 if (sk == NULL) { 553 if (!sk) {
554 ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev), 554 ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev),
555 ICMP6_MIB_INERRORS); 555 ICMP6_MIB_INERRORS);
556 return; 556 return;
@@ -749,7 +749,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
749 749
750 for (i = 0; i < count; i++) { 750 for (i = 0; i < count; i++) {
751 sk = stack[i]; 751 sk = stack[i];
752 if (likely(skb1 == NULL)) 752 if (likely(!skb1))
753 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); 753 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
754 if (!skb1) { 754 if (!skb1) {
755 atomic_inc(&sk->sk_drops); 755 atomic_inc(&sk->sk_drops);
@@ -1207,7 +1207,7 @@ do_udp_sendmsg:
1207 fl6.flowlabel = sin6->sin6_flowinfo&IPV6_FLOWINFO_MASK; 1207 fl6.flowlabel = sin6->sin6_flowinfo&IPV6_FLOWINFO_MASK;
1208 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) { 1208 if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) {
1209 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 1209 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
1210 if (flowlabel == NULL) 1210 if (!flowlabel)
1211 return -EINVAL; 1211 return -EINVAL;
1212 } 1212 }
1213 } 1213 }
@@ -1255,14 +1255,14 @@ do_udp_sendmsg:
1255 } 1255 }
1256 if ((fl6.flowlabel&IPV6_FLOWLABEL_MASK) && !flowlabel) { 1256 if ((fl6.flowlabel&IPV6_FLOWLABEL_MASK) && !flowlabel) {
1257 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); 1257 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
1258 if (flowlabel == NULL) 1258 if (!flowlabel)
1259 return -EINVAL; 1259 return -EINVAL;
1260 } 1260 }
1261 if (!(opt->opt_nflen|opt->opt_flen)) 1261 if (!(opt->opt_nflen|opt->opt_flen))
1262 opt = NULL; 1262 opt = NULL;
1263 connected = 0; 1263 connected = 0;
1264 } 1264 }
1265 if (opt == NULL) 1265 if (!opt)
1266 opt = np->opt; 1266 opt = np->opt;
1267 if (flowlabel) 1267 if (flowlabel)
1268 opt = fl6_merge_options(&opt_space, flowlabel, opt); 1268 opt = fl6_merge_options(&opt_space, flowlabel, opt);