aboutsummaryrefslogtreecommitdiffstats
path: root/net/ax25/ax25_std_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ax25/ax25_std_timer.c')
-rw-r--r--net/ax25/ax25_std_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_std_timer.c b/net/ax25/ax25_std_timer.c
index f2f6918ac9bb..96e4b9273250 100644
--- a/net/ax25/ax25_std_timer.c
+++ b/net/ax25/ax25_std_timer.c
@@ -32,7 +32,7 @@
32 32
33void ax25_std_heartbeat_expiry(ax25_cb *ax25) 33void ax25_std_heartbeat_expiry(ax25_cb *ax25)
34{ 34{
35 struct sock *sk=ax25->sk; 35 struct sock *sk = ax25->sk;
36 36
37 if (sk) 37 if (sk)
38 bh_lock_sock(sk); 38 bh_lock_sock(sk);
@@ -62,7 +62,7 @@ void ax25_std_heartbeat_expiry(ax25_cb *ax25)
62 */ 62 */
63 if (sk != NULL) { 63 if (sk != NULL) {
64 if (atomic_read(&sk->sk_rmem_alloc) < 64 if (atomic_read(&sk->sk_rmem_alloc) <
65 (sk->sk_rcvbuf / 2) && 65 (sk->sk_rcvbuf >> 1) &&
66 (ax25->condition & AX25_COND_OWN_RX_BUSY)) { 66 (ax25->condition & AX25_COND_OWN_RX_BUSY)) {
67 ax25->condition &= ~AX25_COND_OWN_RX_BUSY; 67 ax25->condition &= ~AX25_COND_OWN_RX_BUSY;
68 ax25->condition &= ~AX25_COND_ACK_PENDING; 68 ax25->condition &= ~AX25_COND_ACK_PENDING;