diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /net/dccp/proto.c | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 945b4d5d23b3..314a1b5c033c 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
| @@ -174,8 +174,6 @@ int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized) | |||
| 174 | struct dccp_sock *dp = dccp_sk(sk); | 174 | struct dccp_sock *dp = dccp_sk(sk); |
| 175 | struct inet_connection_sock *icsk = inet_csk(sk); | 175 | struct inet_connection_sock *icsk = inet_csk(sk); |
| 176 | 176 | ||
| 177 | dccp_minisock_init(&dp->dccps_minisock); | ||
| 178 | |||
| 179 | icsk->icsk_rto = DCCP_TIMEOUT_INIT; | 177 | icsk->icsk_rto = DCCP_TIMEOUT_INIT; |
| 180 | icsk->icsk_syn_retries = sysctl_dccp_request_retries; | 178 | icsk->icsk_syn_retries = sysctl_dccp_request_retries; |
| 181 | sk->sk_state = DCCP_CLOSED; | 179 | sk->sk_state = DCCP_CLOSED; |