and changed files

[powerpc.git] / net / netrom / nr_timer.c

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 75b72d3..6cfaad9 100644 (file)
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -43,7 +43,7 @@ void nr_init_timers(struct sock *sk)
        init_timer(&nr->t1timer);
        nr->t1timer.data     = (unsigned long)sk;
        nr->t1timer.function = &nr_t1timer_expiry;
-       
+
        init_timer(&nr->t2timer);
        nr->t2timer.data     = (unsigned long)sk;
        nr->t2timer.function = &nr_t2timer_expiry;
@@ -138,8 +138,8 @@ static void nr_heartbeat_expiry(unsigned long param)
                if (sock_flag(sk, SOCK_DESTROY) ||
                    (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
                        sock_hold(sk);
-                       nr_destroy_socket(sk);
                        bh_unlock_sock(sk);
+                       nr_destroy_socket(sk);
                        sock_put(sk);
                        return;
                }