vfs: remove extraneous NULL d_inode check from do_filp_open

[linux-2.6-block.git] / net / rose / rose_in.c

diff --git a/net/rose/rose_in.c b/net/rose/rose_in.c
index 8348d33f1efefceb64472f52577067c3550931bf..7f7fcb46b4fa00371201dee0e83f17819db9c5e3 100644 (file)
--- a/net/rose/rose_in.c
+++ b/net/rose/rose_in.c
@@ -16,7 +16,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>
@@ -183,7 +182,7 @@ static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety
                                break;
                        }
                        if (atomic_read(&sk->sk_rmem_alloc) >
-                           (sk->sk_rcvbuf / 2))
+                           (sk->sk_rcvbuf >> 1))
                                rose->condition |= ROSE_COND_OWN_RX_BUSY;
                }
                /*