1 files changed, 6 insertions, 2 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c56c350324e4..2faef339d8f2 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -191,7 +191,8 @@ struct ipv6_pinfo {
         /* sockopt flags */
         __u16                   recverr:1,
                                 sndflow:1,
-                                pmtudisc:2,
+                                repflow:1,
+                                pmtudisc:3,
                                 ipv6only:1,
                                 srcprefs:3,     /* 001: prefer temporary address
                                                  * 010: prefer public address
@@ -200,7 +201,7 @@ struct ipv6_pinfo {
                                 dontfrag:1;
         __u8                    min_hopcount;
         __u8                    tclass;
-        __u8                    rcv_tclass;
+        __be32                  rcv_flowinfo;
 
         __u32                   dst_cookie;
         __u32                   rx_dst_cookie;
@@ -283,6 +284,8 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
 
 #define __ipv6_only_sock(sk)    (inet6_sk(sk)->ipv6only)
 #define ipv6_only_sock(sk)      ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))
+#define ipv6_sk_rxinfo(sk)      ((sk)->sk_family == PF_INET6 && \
+                                 inet6_sk(sk)->rxopt.bits.rxinfo)
 
 static inline const struct in6_addr *inet6_rcv_saddr(const struct sock *sk)
 {
@@ -299,6 +302,7 @@ static inline int inet_v6_ipv6only(const struct sock *sk)
 #else
 #define __ipv6_only_sock(sk)    0
 #define ipv6_only_sock(sk)      0
+#define ipv6_sk_rxinfo(sk)      0
 
 static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)
 {