aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6/udp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-11-20 20:52:16 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2005-11-20 20:52:16 -0800
commit1ef43204f4bd24dcd3156185b19b31b6b4151ae9 (patch)
tree812293eda94f9e14ee35c0be3d84da4b96f4972e /net/ipv6/udp.c
parent5d5780df23537ad0db72267fe11103d2c23d9b2a (diff)
parentdf9890c31a1a447254f39e40c3fd81ad6547945b (diff)
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r--net/ipv6/udp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e671153b47b..5cc8731eb55 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);