4 files changed, 48 insertions, 10 deletions

diff --git a/include/linux/in6.h b/include/linux/in6.h
index dcf5720ffcbb..bd32b79d6295 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -148,13 +148,13 @@ struct in6_flowlabel_req
  */
 
 #define IPV6_ADDRFORM           1
-#define IPV6_PKTINFO            2
-#define IPV6_HOPOPTS            3
-#define IPV6_DSTOPTS            4
-#define IPV6_RTHDR              5
-#define IPV6_PKTOPTIONS         6
+#define IPV6_2292PKTINFO        2
+#define IPV6_2292HOPOPTS        3
+#define IPV6_2292DSTOPTS        4
+#define IPV6_2292RTHDR          5
+#define IPV6_2292PKTOPTIONS     6
 #define IPV6_CHECKSUM           7
-#define IPV6_HOPLIMIT           8
+#define IPV6_2292HOPLIMIT       8
 #define IPV6_NEXTHOP            9
 #define IPV6_AUTHHDR            10      /* obsolete */
 #define IPV6_FLOWINFO           11
@@ -198,4 +198,28 @@ struct in6_flowlabel_req
  * MCAST_MSFILTER               48
  */
 
+/* RFC3542 advanced socket options (50-67) */
+#define IPV6_RECVPKTINFO        50
+#define IPV6_PKTINFO            51
+#if 0
+#define IPV6_RECVPATHMTU        52
+#define IPV6_PATHMTU            53
+#define IPV6_DONTFRAG           54
+#define IPV6_USE_MIN_MTU        55
+#endif
+#define IPV6_RECVHOPOPTS        56
+#define IPV6_HOPOPTS            57
+#if 0
+#define IPV6_RECVRTHDRDSTOPTS   58      /* Unused, see net/ipv6/datagram.c */
+#endif
+#define IPV6_RTHDRDSTOPTS       59
+#define IPV6_RECVRTHDR          60
+#define IPV6_RTHDR              61
+#define IPV6_RECVDSTOPTS        62
+#define IPV6_DSTOPTS            63
+#define IPV6_RECVHOPLIMIT       64
+#define IPV6_HOPLIMIT           65
+#define IPV6_RECVTCLASS         66
+#define IPV6_TCLASS             67
+
 #endif
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 3c7dbc6a0a70..6c5f7b39a4b0 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,20 @@ 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,
-                                rxflow:1;
+                                odstopts:1,
+                                rxflow:1,
+                                rxtclass:1;
                 } bits;
-                __u8            all;
+                __u16           all;
         } rxopt;
 
         /* sockopt flags */
@@ -250,6 +257,7 @@ struct ipv6_pinfo {
                                 sndflow:1,
                                 pmtudisc:2,
                                 ipv6only:1;
+        __u8                    tclass;
 
         __u32                   dst_cookie;
 
@@ -263,6 +271,7 @@ struct ipv6_pinfo {
                 struct ipv6_txoptions *opt;
                 struct rt6_info *rt;
                 int hop_limit;
+                int tclass;
         } cork;
 };
 
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 3203eaff4bd4..65ec86678a08 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -233,6 +233,10 @@ extern int 			ip6_ra_control(struct sock *sk, int sel,
 extern int                      ipv6_parse_hopopts(struct sk_buff *skb, int);
 
 extern struct ipv6_txoptions *  ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt);
+extern struct ipv6_txoptions *  ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
+                                                   int newtype,
+                                                   struct ipv6_opt_hdr __user *newopt,
+                                                   int newoptlen);
 
 extern int ip6_frag_nqueues;
 extern atomic_t ip6_frag_mem;
@@ -373,6 +377,7 @@ extern int			ip6_append_data(struct sock *sk,
                                                 int length,
                                                 int transhdrlen,
                                                 int hlimit,
+                                                int tclass,
                                                 struct ipv6_txoptions *opt,
                                                 struct flowi *fl,
                                                 struct rt6_info *rt,
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 8b075ab7a26c..4e86f2de6638 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -37,7 +37,7 @@ extern int			datagram_recv_ctl(struct sock *sk,
 extern int                      datagram_send_ctl(struct msghdr *msg,
                                                   struct flowi *fl,
                                                   struct ipv6_txoptions *opt,
-                                                  int *hlimit);
+                                                  int *hlimit, int *tclass);
 
 #define         LOOPBACK4_IPV6          __constant_htonl(0x7f000006)