aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2005-08-09 23:07:13 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 18:40:29 -0400
commit2d8c4ce51903636ce0f60addc8134aa50ab8fa76 (patch)
tree1ea4d4faf831b832489b30b13d8910777020feed /net/ipv6
parentff21d5774b4a186c98be6398eacde75d896db804 (diff)
[INET]: Generalise tcp_bind_hash & tcp_inherit_port
This required moving tcp_bucket_cachep to inet_hashinfo. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index a8ca7ba06c1c..bfbedb56bce2 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -205,7 +205,7 @@ tb_not_found:
205 205
206success: 206success:
207 if (!inet_sk(sk)->bind_hash) 207 if (!inet_sk(sk)->bind_hash)
208 tcp_bind_hash(sk, tb, snum); 208 inet_bind_hash(sk, tb, snum);
209 BUG_TRAP(inet_sk(sk)->bind_hash == tb); 209 BUG_TRAP(inet_sk(sk)->bind_hash == tb);
210 ret = 0; 210 ret = 0;
211 211
@@ -597,7 +597,7 @@ ok:
597 hint += i; 597 hint += i;
598 598
599 /* Head lock still held and bh's disabled */ 599 /* Head lock still held and bh's disabled */
600 tcp_bind_hash(sk, tb, port); 600 inet_bind_hash(sk, tb, port);
601 if (sk_unhashed(sk)) { 601 if (sk_unhashed(sk)) {
602 inet_sk(sk)->sport = htons(port); 602 inet_sk(sk)->sport = htons(port);
603 __tcp_v6_hash(sk); 603 __tcp_v6_hash(sk);
@@ -1536,7 +1536,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
1536 newinet->daddr = newinet->saddr = newinet->rcv_saddr = LOOPBACK4_IPV6; 1536 newinet->daddr = newinet->saddr = newinet->rcv_saddr = LOOPBACK4_IPV6;
1537 1537
1538 __tcp_v6_hash(newsk); 1538 __tcp_v6_hash(newsk);
1539 tcp_inherit_port(sk, newsk); 1539 inet_inherit_port(&tcp_hashinfo, sk, newsk);
1540 1540
1541 return newsk; 1541 return newsk;
1542 1542