Patched in Tegra support.

4 files changed, 24 insertions, 41 deletions

diff --git a/net/bluetooth/cmtp/Kconfig b/net/bluetooth/cmtp/Kconfig
index 94cbf42ce15..d6b0382f6f3 100644
--- a/net/bluetooth/cmtp/Kconfig
+++ b/net/bluetooth/cmtp/Kconfig
@@ -1,6 +1,6 @@
 config BT_CMTP
         tristate "CMTP protocol support"
-        depends on BT && ISDN_CAPI
+        depends on BT && BT_L2CAP && ISDN_CAPI
         help
           CMTP (CAPI Message Transport Protocol) is a transport layer
           for CAPI messages.  CMTP is required for the Bluetooth Common
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index a4a9d4b6816..50f0d135eb8 100644
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -20,7 +20,7 @@
    SOFTWARE IS DISCLAIMED.
 */
 
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/types.h>
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index e0a6ebf2baa..521baa4fe83 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -53,24 +53,28 @@ static LIST_HEAD(cmtp_session_list);
 static struct cmtp_session *__cmtp_get_session(bdaddr_t *bdaddr)
 {
         struct cmtp_session *session;
+        struct list_head *p;
 
         BT_DBG("");
 
-        list_for_each_entry(session, &cmtp_session_list, list)
+        list_for_each(p, &cmtp_session_list) {
+                session = list_entry(p, struct cmtp_session, list);
                 if (!bacmp(bdaddr, &session->bdaddr))
                         return session;
-
+        }
         return NULL;
 }
 
 static void __cmtp_link_session(struct cmtp_session *session)
 {
+        __module_get(THIS_MODULE);
         list_add(&session->list, &cmtp_session_list);
 }
 
 static void __cmtp_unlink_session(struct cmtp_session *session)
 {
         list_del(&session->list);
+        module_put(THIS_MODULE);
 }
 
 static void __cmtp_copy_session(struct cmtp_session *session, struct cmtp_conninfo *ci)
@@ -298,10 +302,7 @@ static int cmtp_session(void *arg)
 
                 while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
                         skb_orphan(skb);
-                        if (!skb_linearize(skb))
-                                cmtp_recv_frame(session, skb);
-                        else
-                                kfree_skb(skb);
+                        cmtp_recv_frame(session, skb);
                 }
 
                 cmtp_process_transmit(session);
@@ -323,7 +324,6 @@ static int cmtp_session(void *arg)
         up_write(&cmtp_session_sem);
 
         kfree(session);
-        module_put_and_exit(0);
         return 0;
 }
 
@@ -353,7 +353,7 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
 
         BT_DBG("mtu %d", session->mtu);
 
-        sprintf(session->name, "%pMR", &bt_sk(sock->sk)->dst);
+        sprintf(session->name, "%s", batostr(&bt_sk(sock->sk)->dst));
 
         session->sock  = sock;
         session->state = BT_CONFIG;
@@ -373,11 +373,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
 
         __cmtp_link_session(session);
 
-        __module_get(THIS_MODULE);
         session->task = kthread_run(cmtp_session, session, "kcmtpd_ctr_%d",
                                                                 session->num);
         if (IS_ERR(session->task)) {
-                module_put(THIS_MODULE);
                 err = PTR_ERR(session->task);
                 goto unlink;
         }
@@ -430,16 +428,19 @@ int cmtp_del_connection(struct cmtp_conndel_req *req)
 
 int cmtp_get_connlist(struct cmtp_connlist_req *req)
 {
-        struct cmtp_session *session;
+        struct list_head *p;
         int err = 0, n = 0;
 
         BT_DBG("");
 
         down_read(&cmtp_session_sem);
 
-        list_for_each_entry(session, &cmtp_session_list, list) {
+        list_for_each(p, &cmtp_session_list) {
+                struct cmtp_session *session;
                 struct cmtp_conninfo ci;
 
+                session = list_entry(p, struct cmtp_session, list);
+
                 __cmtp_copy_session(session, &ci);
 
                 if (copy_to_user(req->ci, &ci, sizeof(ci))) {
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 1c57482112b..3f2dd5c25ae 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -20,7 +20,7 @@
    SOFTWARE IS DISCLAIMED.
 */
 
-#include <linux/export.h>
+#include <linux/module.h>
 
 #include <linux/types.h>
 #include <linux/capability.h>
@@ -39,13 +39,10 @@
 
 #include <linux/isdn/capilli.h>
 
+#include <asm/system.h>
 
 #include "cmtp.h"
 
-static struct bt_sock_list cmtp_sk_list = {
-        .lock = __RW_LOCK_UNLOCKED(cmtp_sk_list.lock)
-};
-
 static int cmtp_sock_release(struct socket *sock)
 {
         struct sock *sk = sock->sk;
@@ -55,8 +52,6 @@ static int cmtp_sock_release(struct socket *sock)
         if (!sk)
                 return 0;
 
-        bt_sock_unlink(&cmtp_sk_list, sk);
-
         sock_orphan(sk);
         sock_put(sk);
 
@@ -78,7 +73,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
         switch (cmd) {
         case CMTPCONNADD:
                 if (!capable(CAP_NET_ADMIN))
-                        return -EPERM;
+                        return -EACCES;
 
                 if (copy_from_user(&ca, argp, sizeof(ca)))
                         return -EFAULT;
@@ -103,7 +98,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
         case CMTPCONNDEL:
                 if (!capable(CAP_NET_ADMIN))
-                        return -EPERM;
+                        return -EACCES;
 
                 if (copy_from_user(&cd, argp, sizeof(cd)))
                         return -EFAULT;
@@ -142,10 +137,10 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 {
         if (cmd == CMTPGETCONNLIST) {
                 struct cmtp_connlist_req cl;
-                u32 uci;
+                uint32_t uci;
                 int err;
 
-                if (get_user(cl.cnum, (u32 __user *) arg) ||
+                if (get_user(cl.cnum, (uint32_t __user *) arg) ||
                                 get_user(uci, (u32 __user *) (arg + 4)))
                         return -EFAULT;
 
@@ -156,7 +151,7 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 
                 err = cmtp_get_connlist(&cl);
 
-                if (!err && put_user(cl.cnum, (u32 __user *) arg))
+                if (!err && put_user(cl.cnum, (uint32_t __user *) arg))
                         err = -EFAULT;
 
                 return err;
@@ -220,8 +215,6 @@ static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol,
         sk->sk_protocol = protocol;
         sk->sk_state    = BT_OPEN;
 
-        bt_sock_link(&cmtp_sk_list, sk);
-
         return 0;
 }
 
@@ -240,30 +233,19 @@ int cmtp_init_sockets(void)
                 return err;
 
         err = bt_sock_register(BTPROTO_CMTP, &cmtp_sock_family_ops);
-        if (err < 0) {
-                BT_ERR("Can't register CMTP socket");
-                goto error;
-        }
-
-        err = bt_procfs_init(THIS_MODULE, &init_net, "cmtp", &cmtp_sk_list, NULL);
-        if (err < 0) {
-                BT_ERR("Failed to create CMTP proc file");
-                bt_sock_unregister(BTPROTO_HIDP);
+        if (err < 0)
                 goto error;
-        }
-
-        BT_INFO("CMTP socket layer initialized");
 
         return 0;
 
 error:
+        BT_ERR("Can't register CMTP socket");
         proto_unregister(&cmtp_proto);
         return err;
 }
 
 void cmtp_cleanup_sockets(void)
 {
-        bt_procfs_cleanup(&init_net, "cmtp");
         if (bt_sock_unregister(BTPROTO_CMTP) < 0)
                 BT_ERR("Can't unregister CMTP socket");