Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/

1 files changed, 3 insertions, 1 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e671153b47b2..5cc8731eb55b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -771,7 +771,9 @@ do_udp_sendmsg:
         }
         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 = IPPROTO_UDP;
         ipv6_addr_copy(&fl->fl6_dst, daddr);