macintosh: Use linux/of_{device,platform}.h instead of asm

[linux-2.6-omap-h63xx.git] / net / ax25 / ax25_std_timer.c

diff --git a/net/ax25/ax25_std_timer.c b/net/ax25/ax25_std_timer.c
index a29c480a4dc1f992f7f339c44f4b3d0ca9184526..96e4b9273250918b4a60fdcc9ccce00b79090827 100644 (file)
--- a/net/ax25/ax25_std_timer.c
+++ b/net/ax25/ax25_std_timer.c
@@ -14,7 +14,6 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>
@@ -33,8 +32,8 @@
 
 void ax25_std_heartbeat_expiry(ax25_cb *ax25)
 {
-       struct sock *sk=ax25->sk;
-       
+       struct sock *sk = ax25->sk;
+
        if (sk)
                bh_lock_sock(sk);
 
@@ -63,7 +62,7 @@ void ax25_std_heartbeat_expiry(ax25_cb *ax25)
                 */
                if (sk != NULL) {
                        if (atomic_read(&sk->sk_rmem_alloc) <
-                           (sk->sk_rcvbuf / 2) &&
+                           (sk->sk_rcvbuf >> 1) &&
                            (ax25->condition & AX25_COND_OWN_RX_BUSY)) {
                                ax25->condition &= ~AX25_COND_OWN_RX_BUSY;
                                ax25->condition &= ~AX25_COND_ACK_PENDING;