ipv6: remove rcv_tclass of ipv6_pinfo

tclass information in now already stored in rcv_flowinfo
We do not need to store the same information twice.

Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 2 insertions, 7 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 0b2ebfbbe0f4..3fde06645553 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -200,7 +200,6 @@ struct ipv6_pinfo {
                                 dontfrag:1;
         __u8                    min_hopcount;
         __u8                    tclass;
-        __u8                    rcv_tclass;
         __be32                  rcv_flowinfo;
 
         __u32                   dst_cookie;
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index c2db1df46385..7d9391506856 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -1019,7 +1019,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
                                 put_cmsg(&msg, SOL_IPV6, IPV6_HOPLIMIT, sizeof(hlim), &hlim);
                         }
                         if (np->rxopt.bits.rxtclass) {
-                                int tclass = np->rcv_tclass;
+                                int tclass = ntohl(np->rcv_flowinfo & IPV6_TCLASS_MASK) >> 20;
                                 put_cmsg(&msg, SOL_IPV6, IPV6_TCLASS, sizeof(tclass), &tclass);
                         }
                         if (np->rxopt.bits.rxoinfo) {
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 79a196369558..bd91e7ff482b 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1135,7 +1135,6 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
                 newnp->opt         = NULL;
                 newnp->mcast_oif   = inet6_iif(skb);
                 newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;
-                newnp->rcv_tclass  = ipv6_get_dsfield(ipv6_hdr(skb));
                 newnp->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb));
 
                 /*
@@ -1216,7 +1215,6 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
         newnp->opt        = NULL;
         newnp->mcast_oif  = inet6_iif(skb);
         newnp->mcast_hops = ipv6_hdr(skb)->hop_limit;
-        newnp->rcv_tclass = ipv6_get_dsfield(ipv6_hdr(skb));
         newnp->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb));
 
         /* Clone native IPv6 options from listening socket (if any)
@@ -1427,9 +1425,7 @@ ipv6_pktoptions:
                         np->mcast_oif = inet6_iif(opt_skb);
                 if (np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim)
                         np->mcast_hops = ipv6_hdr(opt_skb)->hop_limit;
-                if (np->rxopt.bits.rxtclass)
-                        np->rcv_tclass = ipv6_get_dsfield(ipv6_hdr(opt_skb));
-                if (np->rxopt.bits.rxflow)
+                if (np->rxopt.bits.rxflow || np->rxopt.bits.rxtclass)
                         np->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb));
                 if (ipv6_opt_accepted(sk, opt_skb)) {
                         skb_set_owner_r(opt_skb, sk);