X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fx25%2Fx25_timer.c;h=2af190dc5b014ef8f544772d188c668e367f3a90;hb=b7405e16435f710edfae6ba32bef4ca20d3de145;hp=71ff3088f6fe325cb7321df423566ce59e420b5e;hpb=1465887cfe79889273e3fd3aaf862e7ec3ee244f;p=powerpc.git diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c index 71ff3088f6..2af190dc5b 100644 --- a/net/x25/x25_timer.c +++ b/net/x25/x25_timer.c @@ -3,7 +3,7 @@ * * This is ALPHA test software. This code may break your machine, * randomly fail to work with new releases, misbehave and/or generally - * screw up. It might even work. + * screw up. It might even work. * * This code REQUIRES 2.1.15 or higher * @@ -99,8 +99,8 @@ static void x25_heartbeat_expiry(unsigned long param) { struct sock *sk = (struct sock *)param; - bh_lock_sock(sk); - if (sock_owned_by_user(sk)) /* can currently only occur in state 3 */ + bh_lock_sock(sk); + if (sock_owned_by_user(sk)) /* can currently only occur in state 3 */ goto restart_heartbeat; switch (x25_sk(sk)->state) {