Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / net / rds / tcp_listen.c

diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 27844f231d103a4e49e542d670eaca66d01e761d..8b5cc4aa8868702cc743a87c96a100e58809865f 100644 (file)
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -116,7 +116,7 @@ void rds_tcp_listen_data_ready(struct sock *sk, int bytes)
 
        read_lock_bh(&sk->sk_callback_lock);
        ready = sk->sk_user_data;
-       if (ready == NULL) { /* check for teardown race */
+       if (!ready) { /* check for teardown race */
                ready = sk->sk_data_ready;
                goto out;
        }
@@ -135,7 +135,7 @@ out:
        ready(sk, bytes);
 }
 
-int __init rds_tcp_listen_init(void)
+int rds_tcp_listen_init(void)
 {
        struct sockaddr_in sin;
        struct socket *sock = NULL;
@@ -178,7 +178,7 @@ void rds_tcp_listen_stop(void)
        struct socket *sock = rds_tcp_listen_sock;
        struct sock *sk;
 
-       if (sock == NULL)
+       if (!sock)
                return;
 
        sk = sock->sk;