This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / bluetooth / af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 8ff58bc..e0fa1b0 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -51,7 +51,7 @@
 #define BT_DBG(D...)
 #endif
 
-#define VERSION "2.7"
+#define VERSION "2.6"
 
 struct proc_dir_entry *proc_bt;
 EXPORT_SYMBOL(proc_bt);
@@ -165,7 +165,7 @@ void bt_accept_enqueue(struct sock *parent, struct sock *sk)
 }
 EXPORT_SYMBOL(bt_accept_enqueue);
 
-void bt_accept_unlink(struct sock *sk)
+static void bt_accept_unlink(struct sock *sk)
 {
        BT_DBG("sk %p state %d", sk, sk->sk_state);
 
@@ -174,7 +174,6 @@ void bt_accept_unlink(struct sock *sk)
        bt_sk(sk)->parent = NULL;
        sock_put(sk);
 }
-EXPORT_SYMBOL(bt_accept_unlink);
 
 struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
 {
@@ -187,8 +186,6 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
                sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
 
                lock_sock(sk);
-
-               /* FIXME: Is this check still needed */
                if (sk->sk_state == BT_CLOSED) {
                        release_sock(sk);
                        bt_accept_unlink(sk);
@@ -202,7 +199,6 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
                        release_sock(sk);
                        return sk;
                }
-
                release_sock(sk);
        }
        return NULL;