aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/udp.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2005-11-19 22:23:18 -0500
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2005-11-19 22:23:18 -0500
commitdf9890c31a1a447254f39e40c3fd81ad6547945b (patch)
treebf432d75796112d86d102fe721bdce93e6ad6901 /net/ipv6/udp.c
parenta305989386e402f48b216786a5c8cf440b33bdad (diff)
[IPV6]: Fix sending extension headers before and including routing header.
Based on suggestion from Masahide Nakamura <nakam@linux-ipv6.org>. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
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 bf9519341fd3..e2b87cc68b7b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -778,7 +778,9 @@ do_udp_sendmsg:
778 } 778 }
779 if (opt == NULL) 779 if (opt == NULL)
780 opt = np->opt; 780 opt = np->opt;
781 opt = fl6_merge_options(&opt_space, flowlabel, opt); 781 if (flowlabel)
782 opt = fl6_merge_options(&opt_space, flowlabel, opt);
783 opt = ipv6_fixup_options(&opt_space, opt);
782 784
783 fl->proto = IPPROTO_UDP; 785 fl->proto = IPPROTO_UDP;
784 ipv6_addr_copy(&fl->fl6_dst, daddr); 786 ipv6_addr_copy(&fl->fl6_dst, daddr);