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

Commit a94f723d authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[TCP]: Remove dead code in init_sequence 



This removes two redundancies:

1) The test (skb->protocol == htons(ETH_P_IPV6) in tcp_v6_init_sequence()
   is always true, due to
	* tcp_v6_conn_request() is the only function calling this one
	* tcp_v6_conn_request() redirects all skb's with ETH_P_IP protocol to
	  tcp_v4_conn_request() [ cf. top of tcp_v6_conn_request()]

2) The first argument, `struct sock *sk' of tcp_v{4,6}_init_sequence() is
   never used.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f4e5fff

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void tcp_unhash(struct sock *sk) 
	inet_unhash(&tcp_hashinfo, sk);

}



static inline __u32 tcp_v4_init_sequence(struct sock *sk, struct sk_buff *skb)

static inline __u32 tcp_v4_init_sequence(struct sk_buff *skb)

{

	return secure_tcp_sequence_number(skb->nh.iph->daddr,

					  skb->nh.iph->saddr,
@@ -859,7 +859,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
			goto drop_and_free;

		}



		isn = tcp_v4_init_sequence(sk, skb);

		isn = tcp_v4_init_sequence(skb);

	}

	tcp_rsk(req)->snt_isn = isn;

net/ipv6/tcp_ipv6.c

+6 −13
Original line number Diff line number Diff line
@@ -106,19 +106,12 @@ static __inline__ u16 tcp_v6_check(struct tcphdr *th, int len, 
	return csum_ipv6_magic(saddr, daddr, len, IPPROTO_TCP, base);

}



static __u32 tcp_v6_init_sequence(struct sock *sk, struct sk_buff *skb)

static __u32 tcp_v6_init_sequence(struct sk_buff *skb)

{

	if (skb->protocol == htons(ETH_P_IPV6)) {

	return secure_tcpv6_sequence_number(skb->nh.ipv6h->daddr.s6_addr32,

					    skb->nh.ipv6h->saddr.s6_addr32,

					    skb->h.th->dest,

					    skb->h.th->source);

	} else {

		return secure_tcp_sequence_number(skb->nh.iph->daddr,

						  skb->nh.iph->saddr,

						  skb->h.th->dest,

						  skb->h.th->source);

	}

}



static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
@@ -822,7 +815,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
		treq->iif = inet6_iif(skb);



	if (isn == 0) 

		isn = tcp_v6_init_sequence(sk,skb);

		isn = tcp_v6_init_sequence(skb);



	tcp_rsk(req)->snt_isn = isn;