diff options
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 3f54ac5f05b8..d491125011c4 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -219,7 +219,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net, | |||
219 | * with the same label can only appear on another sock | 219 | * with the same label can only appear on another sock |
220 | */ | 220 | */ |
221 | lfl = __fl_lookup(net, fl->label); | 221 | lfl = __fl_lookup(net, fl->label); |
222 | if (lfl != NULL) { | 222 | if (lfl) { |
223 | atomic_inc(&lfl->users); | 223 | atomic_inc(&lfl->users); |
224 | spin_unlock_bh(&ip6_fl_lock); | 224 | spin_unlock_bh(&ip6_fl_lock); |
225 | return lfl; | 225 | return lfl; |
@@ -300,7 +300,7 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space, | |||
300 | if (!fopt || fopt->opt_flen == 0) | 300 | if (!fopt || fopt->opt_flen == 0) |
301 | return fl_opt; | 301 | return fl_opt; |
302 | 302 | ||
303 | if (fl_opt != NULL) { | 303 | if (fl_opt) { |
304 | opt_space->hopopt = fl_opt->hopopt; | 304 | opt_space->hopopt = fl_opt->hopopt; |
305 | opt_space->dst0opt = fl_opt->dst0opt; | 305 | opt_space->dst0opt = fl_opt->dst0opt; |
306 | opt_space->srcrt = fl_opt->srcrt; | 306 | opt_space->srcrt = fl_opt->srcrt; |
@@ -661,7 +661,7 @@ release: | |||
661 | goto done; | 661 | goto done; |
662 | 662 | ||
663 | fl1 = fl_intern(net, fl, freq.flr_label); | 663 | fl1 = fl_intern(net, fl, freq.flr_label); |
664 | if (fl1 != NULL) | 664 | if (fl1) |
665 | goto recheck; | 665 | goto recheck; |
666 | 666 | ||
667 | if (!freq.flr_label) { | 667 | if (!freq.flr_label) { |