[IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542).

Support several new socket options / ancillary data:
  IPV6_RECVPKTINFO, IPV6_PKTINFO,
  IPV6_RECVHOPOPTS, IPV6_HOPOPTS,
  IPV6_RECVDSTOPTS, IPV6_DSTOPTS, IPV6_RTHDRDSTOPTS,
  IPV6_RECVRTHDR, IPV6_RTHDR,
  IPV6_RECVHOPOPTS, IPV6_HOPOPTS

Old semantics are preserved as IPV6_2292xxxx so that
we can maintain backward compatibility.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index ed3a76b30fd9..e527a1652d7c 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -755,8 +755,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
         }
         if (opt == NULL)
                 opt = np->opt;
-        if (flowlabel)
-                opt = fl6_merge_options(&opt_space, flowlabel, opt);
+        opt = fl6_merge_options(&opt_space, flowlabel, opt);
 
         fl.proto = proto;
         rawv6_probe_proto_opt(&fl, msg);