Merge branch 'master'

1 files changed, 3 insertions, 1 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 8e9628f1c4c5..a66900cda2af 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -748,7 +748,9 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
         }
         if (opt == NULL)
                 opt = np->opt;
-        opt = fl6_merge_options(&opt_space, flowlabel, opt);
+        if (flowlabel)
+                opt = fl6_merge_options(&opt_space, flowlabel, opt);
+        opt = ipv6_fixup_options(&opt_space, opt);
 
         fl.proto = proto;
         rawv6_probe_proto_opt(&fl, msg);