diff options
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index 624fae251f4e..1551ab3890a3 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c | |||
@@ -228,10 +228,10 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space, | |||
228 | struct ipv6_txoptions * fopt) | 228 | struct ipv6_txoptions * fopt) |
229 | { | 229 | { |
230 | struct ipv6_txoptions * fl_opt = fl->opt; | 230 | struct ipv6_txoptions * fl_opt = fl->opt; |
231 | 231 | ||
232 | if (fopt == NULL || fopt->opt_flen == 0) | 232 | if (fopt == NULL || fopt->opt_flen == 0) |
233 | return fl_opt; | 233 | return fl_opt; |
234 | 234 | ||
235 | if (fl_opt != NULL) { | 235 | if (fl_opt != NULL) { |
236 | opt_space->hopopt = fl_opt->hopopt; | 236 | opt_space->hopopt = fl_opt->hopopt; |
237 | opt_space->dst0opt = fl_opt->dst0opt; | 237 | opt_space->dst0opt = fl_opt->dst0opt; |