summaryrefslogtreecommitdiff
path: root/net/ipv6/raw.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-11-21 07:52:16 +0300
committerDavid S. Miller <davem@sunset.davemloft.net>2005-11-21 07:52:16 +0300
commit1ef43204f4bd24dcd3156185b19b31b6b4151ae9 (patch)
tree812293eda94f9e14ee35c0be3d84da4b96f4972e /net/ipv6/raw.c
parent5d5780df23537ad0db72267fe11103d2c23d9b2a (diff)
parentdf9890c31a1a447254f39e40c3fd81ad6547945b (diff)
downloadlinux-1ef43204f4bd24dcd3156185b19b31b6b4151ae9.tar.xz
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r--net/ipv6/raw.c4
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);