aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2006-11-10 17:06:49 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:22:10 -0500
commita94f723d595ee085f81b1788d18e031af7eeba91 (patch)
treece9309a5ba780429bc6e10a2c075af9c9e5b769a /net/ipv4/tcp_ipv4.c
parent6f4e5fff1e4d46714ea554fd83e44eab534e8b11 (diff)
[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: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 5fbf96552cac..2eb58844403c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -111,7 +111,7 @@ void tcp_unhash(struct sock *sk)
111 inet_unhash(&tcp_hashinfo, sk); 111 inet_unhash(&tcp_hashinfo, sk);
112} 112}
113 113
114static inline __u32 tcp_v4_init_sequence(struct sock *sk, struct sk_buff *skb) 114static inline __u32 tcp_v4_init_sequence(struct sk_buff *skb)
115{ 115{
116 return secure_tcp_sequence_number(skb->nh.iph->daddr, 116 return secure_tcp_sequence_number(skb->nh.iph->daddr,
117 skb->nh.iph->saddr, 117 skb->nh.iph->saddr,
@@ -859,7 +859,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
859 goto drop_and_free; 859 goto drop_and_free;
860 } 860 }
861 861
862 isn = tcp_v4_init_sequence(sk, skb); 862 isn = tcp_v4_init_sequence(skb);
863 } 863 }
864 tcp_rsk(req)->snt_isn = isn; 864 tcp_rsk(req)->snt_isn = isn;
865 865