Skip to content

Commit

Permalink
[SOCK]: Rename __tcp_v4_rehash to __sk_prot_rehash
Browse files Browse the repository at this point in the history
This operation was already generic and DCCP will use it.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Arnaldo Carvalho de Melo authored and David S. Miller committed Aug 29, 2005
1 parent e684897 commit 614c6cb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
9 changes: 9 additions & 0 deletions include/net/sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,15 @@ static __inline__ void sock_prot_dec_use(struct proto *prot)
prot->stats[smp_processor_id()].inuse--;
}

/* With per-bucket locks this operation is not-atomic, so that
* this version is not worse.
*/
static inline void __sk_prot_rehash(struct sock *sk)
{
sk->sk_prot->unhash(sk);
sk->sk_prot->hash(sk);
}

/* About 10 seconds */
#define SOCK_DESTROY_TIME (10*HZ)

Expand Down
11 changes: 1 addition & 10 deletions net/ipv4/tcp_ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -1834,15 +1834,6 @@ int tcp_v4_rcv(struct sk_buff *skb)
goto discard_it;
}

/* With per-bucket locks this operation is not-atomic, so that
* this version is not worse.
*/
static void __tcp_v4_rehash(struct sock *sk)
{
sk->sk_prot->unhash(sk);
sk->sk_prot->hash(sk);
}

static int tcp_v4_reselect_saddr(struct sock *sk)
{
struct inet_sock *inet = inet_sk(sk);
Expand Down Expand Up @@ -1889,7 +1880,7 @@ static int tcp_v4_reselect_saddr(struct sock *sk)
* Besides that, it does not check for connection
* uniqueness. Wait for troubles.
*/
__tcp_v4_rehash(sk);
__sk_prot_rehash(sk);
return 0;
}

Expand Down

0 comments on commit 614c6cb

Please sign in to comment.