Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82e9f105 authored by Florent Fourcot's avatar Florent Fourcot Committed by David S. Miller
Browse files

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: default avatarFlorent Fourcot <florent.fourcot@enst-bretagne.fr>
Reviewed-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37cfee90

include/linux/ipv6.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -200,7 +200,6 @@ struct ipv6_pinfo { 
				dontfrag:1;

				dontfrag:1;

	__u8			min_hopcount;

	__u8			min_hopcount;

	__u8			tclass;

	__u8			tclass;

	__u8			rcv_tclass;

	__be32			rcv_flowinfo;

	__be32			rcv_flowinfo;





	__u32			dst_cookie;

	__u32			dst_cookie;

net/ipv6/ipv6_sockglue.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

				put_cmsg(&msg, SOL_IPV6, IPV6_HOPLIMIT, sizeof(hlim), &hlim);

			}

			}

			if (np->rxopt.bits.rxtclass) {

			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);

				put_cmsg(&msg, SOL_IPV6, IPV6_TCLASS, sizeof(tclass), &tclass);

			}

			}

			if (np->rxopt.bits.rxoinfo) {

			if (np->rxopt.bits.rxoinfo) {

net/ipv6/tcp_ipv6.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -1135,7 +1135,6 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 
		newnp->opt	   = NULL;

		newnp->opt	   = NULL;

		newnp->mcast_oif   = inet6_iif(skb);

		newnp->mcast_oif   = inet6_iif(skb);

		newnp->mcast_hops  = ipv6_hdr(skb)->hop_limit;

		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));

		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->opt	  = NULL;

	newnp->mcast_oif  = inet6_iif(skb);

	newnp->mcast_oif  = inet6_iif(skb);

	newnp->mcast_hops = ipv6_hdr(skb)->hop_limit;

	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));

	newnp->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb));





	/* Clone native IPv6 options from listening socket (if any)

	/* Clone native IPv6 options from listening socket (if any)
@@ -1427,9 +1425,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
			np->mcast_oif = inet6_iif(opt_skb);

			np->mcast_oif = inet6_iif(opt_skb);

		if (np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim)

		if (np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim)

			np->mcast_hops = ipv6_hdr(opt_skb)->hop_limit;

			np->mcast_hops = ipv6_hdr(opt_skb)->hop_limit;

		if (np->rxopt.bits.rxtclass)

		if (np->rxopt.bits.rxflow || np->rxopt.bits.rxtclass)

			np->rcv_tclass = ipv6_get_dsfield(ipv6_hdr(opt_skb));

		if (np->rxopt.bits.rxflow)

			np->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb));

			np->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb));

		if (ipv6_opt_accepted(sk, opt_skb)) {

		if (ipv6_opt_accepted(sk, opt_skb)) {

			skb_set_owner_r(opt_skb, sk);

			skb_set_owner_r(opt_skb, sk);