[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, 8 insertions, 2 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 3c7dbc6a0a7..2581f1c94df 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -189,6 +189,7 @@ struct inet6_skb_parm {
         __u16                   dst0;
         __u16                   srcrt;
         __u16                   dst1;
+        __u16                   lastopt;
 };
 
 #define IP6CB(skb)      ((struct inet6_skb_parm*)((skb)->cb))
@@ -234,14 +235,19 @@ struct ipv6_pinfo {
         /* pktoption flags */
         union {
                 struct {
-                        __u8    srcrt:2,
+                        __u16   srcrt:2,
+                                osrcrt:2,
                                 rxinfo:1,
+                                rxoinfo:1,
                                 rxhlim:1,
+                                rxohlim:1,
                                 hopopts:1,
+                                ohopopts:1,
                                 dstopts:1,
+                                odstopts:1,
                                 rxflow:1;
                 } bits;
-                __u8            all;
+                __u16           all;
         } rxopt;
 
         /* sockopt flags */