Merge tag 'nfs-for-4.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / net / bluetooth / af_bluetooth.c

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 70306cc9d8140f696e440de10f9fff864b0abd94..955eda93e66f32b055277a93226ca66b0075fbaf 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -33,8 +33,6 @@
 
 #include "selftest.h"
 
-#define VERSION "2.21"
-
 /* Bluetooth sockets */
 #define BT_MAX_PROTO   8
 static const struct net_proto_family *bt_proto[BT_MAX_PROTO];
@@ -176,20 +174,20 @@ EXPORT_SYMBOL(bt_accept_unlink);
 
 struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
 {
-       struct list_head *p, *n;
+       struct bt_sock *s, *n;
        struct sock *sk;
 
        BT_DBG("parent %p", parent);
 
-       list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
-               sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
+       list_for_each_entry_safe(s, n, &bt_sk(parent)->accept_q, accept_q) {
+               sk = (struct sock *)s;
 
                lock_sock(sk);
 
                /* FIXME: Is this check still needed */
                if (sk->sk_state == BT_CLOSED) {
-                       release_sock(sk);
                        bt_accept_unlink(sk);
+                       release_sock(sk);
                        continue;
                }
 
@@ -390,11 +388,11 @@ EXPORT_SYMBOL(bt_sock_stream_recvmsg);
 
 static inline unsigned int bt_accept_poll(struct sock *parent)
 {
-       struct list_head *p, *n;
+       struct bt_sock *s, *n;
        struct sock *sk;
 
-       list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
-               sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
+       list_for_each_entry_safe(s, n, &bt_sk(parent)->accept_q, accept_q) {
+               sk = (struct sock *)s;
                if (sk->sk_state == BT_CONNECTED ||
                    (test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags) &&
                     sk->sk_state == BT_CONNECT2))
@@ -671,7 +669,7 @@ static const struct file_operations bt_fops = {
 };
 
 int bt_procfs_init(struct net *net, const char *name,
-                  struct bt_sock_list* sk_list,
+                  struct bt_sock_list *sk_list,
                   int (* seq_show)(struct seq_file *, void *))
 {
        sk_list->custom_seq_show = seq_show;
@@ -687,7 +685,7 @@ void bt_procfs_cleanup(struct net *net, const char *name)
 }
 #else
 int bt_procfs_init(struct net *net, const char *name,
-                  struct bt_sock_list* sk_list,
+                  struct bt_sock_list *sk_list,
                   int (* seq_show)(struct seq_file *, void *))
 {
        return 0;
@@ -715,7 +713,7 @@ static int __init bt_init(void)
 
        sock_skb_cb_check_size(sizeof(struct bt_skb_cb));
 
-       BT_INFO("Core ver %s", VERSION);
+       BT_INFO("Core ver %s", BT_SUBSYS_VERSION);
 
        err = bt_selftest();
        if (err < 0)
@@ -789,7 +787,7 @@ subsys_initcall(bt_init);
 module_exit(bt_exit);
 
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
-MODULE_DESCRIPTION("Bluetooth Core ver " VERSION);
-MODULE_VERSION(VERSION);
+MODULE_DESCRIPTION("Bluetooth Core ver " BT_SUBSYS_VERSION);
+MODULE_VERSION(BT_SUBSYS_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_NETPROTO(PF_BLUETOOTH);