diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-11-21 05:52:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-11-21 05:52:16 +0100 |
| commit | 1ef43204f4bd24dcd3156185b19b31b6b4151ae9 (patch) | |
| tree | 812293eda94f9e14ee35c0be3d84da4b96f4972e /net/ipv6/udp.c | |
| parent | [IPV6]: Acquire addrconf_hash_lock for read in addrconf_verify(...) (diff) | |
| parent | [IPV6]: Fix sending extension headers before and including routing header. (diff) | |
| download | linux-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.tar.xz linux-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.zip | |
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.c | 4 |
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); |