diff --git a/[refs] b/[refs] index fa8be88aaabc..46081e6a4ac3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 761172fbf672c5784b2a0d71ca2f4389eb7a2c21 +refs/heads/master: 2cec6b014da6fb4a40ba1c6556cdf9681ed3f89e diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c index cbddd0cb83f1..36e84e13c6aa 100644 --- a/trunk/net/x25/af_x25.c +++ b/trunk/net/x25/af_x25.c @@ -402,6 +402,7 @@ static void __x25_destroy_socket(struct sock *sk) /* * Queue the unaccepted socket for death */ + skb->sk->sk_state = TCP_LISTEN; sock_set_flag(skb->sk, SOCK_DEAD); x25_start_heartbeat(skb->sk); x25_sk(skb->sk)->state = X25_STATE_0;