diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /net/x25 | |
| parent | 7ec75c582e639d956ce3afd499f67febe6f902a4 (diff) | |
| parent | e95ef5d3f6bc60433883e1ef65dac747acd0bf1a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 6cffbc4da029..296e65e01064 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
| @@ -402,6 +402,7 @@ static void __x25_destroy_socket(struct sock *sk) | |||
| 402 | /* | 402 | /* |
| 403 | * Queue the unaccepted socket for death | 403 | * Queue the unaccepted socket for death |
| 404 | */ | 404 | */ |
| 405 | skb->sk->sk_state = TCP_LISTEN; | ||
| 405 | sock_set_flag(skb->sk, SOCK_DEAD); | 406 | sock_set_flag(skb->sk, SOCK_DEAD); |
| 406 | x25_start_heartbeat(skb->sk); | 407 | x25_start_heartbeat(skb->sk); |
| 407 | x25_sk(skb->sk)->state = X25_STATE_0; | 408 | x25_sk(skb->sk)->state = X25_STATE_0; |