diff options
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 9d68837888d3..43fb1600f1f0 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
@@ -149,7 +149,7 @@ success: | |||
149 | if (!inet_csk(sk)->icsk_bind_hash) | 149 | if (!inet_csk(sk)->icsk_bind_hash) |
150 | inet_bind_hash(sk, tb, snum); | 150 | inet_bind_hash(sk, tb, snum); |
151 | BUG_TRAP(inet_csk(sk)->icsk_bind_hash == tb); | 151 | BUG_TRAP(inet_csk(sk)->icsk_bind_hash == tb); |
152 | ret = 0; | 152 | ret = 0; |
153 | 153 | ||
154 | fail_unlock: | 154 | fail_unlock: |
155 | spin_unlock(&head->lock); | 155 | spin_unlock(&head->lock); |
@@ -255,7 +255,7 @@ EXPORT_SYMBOL(inet_csk_accept); | |||
255 | 255 | ||
256 | /* | 256 | /* |
257 | * Using different timers for retransmit, delayed acks and probes | 257 | * Using different timers for retransmit, delayed acks and probes |
258 | * We may wish use just one timer maintaining a list of expire jiffies | 258 | * We may wish use just one timer maintaining a list of expire jiffies |
259 | * to optimize. | 259 | * to optimize. |
260 | */ | 260 | */ |
261 | void inet_csk_init_xmit_timers(struct sock *sk, | 261 | void inet_csk_init_xmit_timers(struct sock *sk, |
@@ -273,7 +273,7 @@ void inet_csk_init_xmit_timers(struct sock *sk, | |||
273 | icsk->icsk_delack_timer.function = delack_handler; | 273 | icsk->icsk_delack_timer.function = delack_handler; |
274 | sk->sk_timer.function = keepalive_handler; | 274 | sk->sk_timer.function = keepalive_handler; |
275 | 275 | ||
276 | icsk->icsk_retransmit_timer.data = | 276 | icsk->icsk_retransmit_timer.data = |
277 | icsk->icsk_delack_timer.data = | 277 | icsk->icsk_delack_timer.data = |
278 | sk->sk_timer.data = (unsigned long)sk; | 278 | sk->sk_timer.data = (unsigned long)sk; |
279 | 279 | ||