Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

Conflicts:
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c

3 files changed, 64 insertions, 48 deletions

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 4e32e18211f9..8743f369ed3f 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -65,7 +65,8 @@ static DEFINE_MUTEX(rfcomm_mutex);
 
 static LIST_HEAD(session_list);
 
-static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len);
+static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len,
+                                                        u32 priority);
 static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci);
 static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci);
 static int rfcomm_queue_disc(struct rfcomm_dlc *d);
@@ -377,13 +378,11 @@ static void rfcomm_dlc_unlink(struct rfcomm_dlc *d)
 static struct rfcomm_dlc *rfcomm_dlc_get(struct rfcomm_session *s, u8 dlci)
 {
         struct rfcomm_dlc *d;
-        struct list_head *p;
 
-        list_for_each(p, &s->dlcs) {
-                d = list_entry(p, struct rfcomm_dlc, list);
+        list_for_each_entry(d, &s->dlcs, list)
                 if (d->dlci == dlci)
                         return d;
-        }
+
         return NULL;
 }
 
@@ -749,19 +748,34 @@ void rfcomm_session_getaddr(struct rfcomm_session *s, bdaddr_t *src, bdaddr_t *d
 }
 
 /* ---- RFCOMM frame sending ---- */
-static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len)
+static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len,
+                                                        u32 priority)
 {
         struct socket *sock = s->sock;
+        struct sock *sk = sock->sk;
         struct kvec iv = { data, len };
         struct msghdr msg;
 
-        BT_DBG("session %p len %d", s, len);
+        BT_DBG("session %p len %d priority %u", s, len, priority);
+
+        if (sk->sk_priority != priority) {
+                lock_sock(sk);
+                sk->sk_priority = priority;
+                release_sock(sk);
+        }
 
         memset(&msg, 0, sizeof(msg));
 
         return kernel_sendmsg(sock, &msg, &iv, 1, len);
 }
 
+static int rfcomm_send_cmd(struct rfcomm_session *s, struct rfcomm_cmd *cmd)
+{
+        BT_DBG("%p cmd %u", s, cmd->ctrl);
+
+        return rfcomm_send_frame(s, (void *) cmd, sizeof(*cmd), HCI_PRIO_MAX);
+}
+
 static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci)
 {
         struct rfcomm_cmd cmd;
@@ -773,7 +787,7 @@ static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci)
         cmd.len  = __len8(0);
         cmd.fcs  = __fcs2((u8 *) &cmd);
 
-        return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd));
+        return rfcomm_send_cmd(s, &cmd);
 }
 
 static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci)
@@ -787,7 +801,7 @@ static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci)
         cmd.len  = __len8(0);
         cmd.fcs  = __fcs2((u8 *) &cmd);
 
-        return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd));
+        return rfcomm_send_cmd(s, &cmd);
 }
 
 static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci)
@@ -801,7 +815,7 @@ static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci)
         cmd.len  = __len8(0);
         cmd.fcs  = __fcs2((u8 *) &cmd);
 
-        return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd));
+        return rfcomm_send_cmd(s, &cmd);
 }
 
 static int rfcomm_queue_disc(struct rfcomm_dlc *d)
@@ -815,6 +829,8 @@ static int rfcomm_queue_disc(struct rfcomm_dlc *d)
         if (!skb)
                 return -ENOMEM;
 
+        skb->priority = HCI_PRIO_MAX;
+
         cmd = (void *) __skb_put(skb, sizeof(*cmd));
         cmd->addr = d->addr;
         cmd->ctrl = __ctrl(RFCOMM_DISC, 1);
@@ -837,7 +853,7 @@ static int rfcomm_send_dm(struct rfcomm_session *s, u8 dlci)
         cmd.len  = __len8(0);
         cmd.fcs  = __fcs2((u8 *) &cmd);
 
-        return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd));
+        return rfcomm_send_cmd(s, &cmd);
 }
 
 static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type)
@@ -862,7 +878,7 @@ static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type)
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d)
@@ -904,7 +920,7 @@ static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,
@@ -942,7 +958,7 @@ int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status)
@@ -969,7 +985,7 @@ static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status)
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig)
@@ -996,7 +1012,7 @@ static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr)
@@ -1018,7 +1034,7 @@ static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr)
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static int rfcomm_send_fcon(struct rfcomm_session *s, int cr)
@@ -1040,7 +1056,7 @@ static int rfcomm_send_fcon(struct rfcomm_session *s, int cr)
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static int rfcomm_send_test(struct rfcomm_session *s, int cr, u8 *pattern, int len)
@@ -1091,7 +1107,7 @@ static int rfcomm_send_credits(struct rfcomm_session *s, u8 addr, u8 credits)
 
         *ptr = __fcs(buf); ptr++;
 
-        return rfcomm_send_frame(s, buf, ptr - buf);
+        return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
 }
 
 static void rfcomm_make_uih(struct sk_buff *skb, u8 addr)
@@ -1769,7 +1785,8 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
                 return skb_queue_len(&d->tx_queue);
 
         while (d->tx_credits && (skb = skb_dequeue(&d->tx_queue))) {
-                err = rfcomm_send_frame(d->session, skb->data, skb->len);
+                err = rfcomm_send_frame(d->session, skb->data, skb->len,
+                                                        skb->priority);
                 if (err < 0) {
                         skb_queue_head(&d->tx_queue, skb);
                         break;
@@ -2120,15 +2137,13 @@ static struct hci_cb rfcomm_cb = {
 static int rfcomm_dlc_debugfs_show(struct seq_file *f, void *x)
 {
         struct rfcomm_session *s;
-        struct list_head *pp, *p;
 
         rfcomm_lock();
 
-        list_for_each(p, &session_list) {
-                s = list_entry(p, struct rfcomm_session, list);
-                list_for_each(pp, &s->dlcs) {
+        list_for_each_entry(s, &session_list, list) {
+                struct rfcomm_dlc *d;
+                list_for_each_entry(d, &s->dlcs, list) {
                         struct sock *sk = s->sock->sk;
-                        struct rfcomm_dlc *d = list_entry(pp, struct rfcomm_dlc, list);
 
                         seq_printf(f, "%s %s %ld %d %d %d %d\n",
                                                 batostr(&bt_sk(sk)->src),
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 5417f6127323..aea2bdd1510f 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -600,6 +600,8 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                         break;
                 }
 
+                skb->priority = sk->sk_priority;
+
                 err = rfcomm_dlc_send(d, skb);
                 if (err < 0) {
                         kfree_skb(skb);
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index c258796313e0..fa8f4de53b99 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -34,6 +34,7 @@
 #include <linux/capability.h>
 #include <linux/slab.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -65,7 +66,7 @@ struct rfcomm_dev {
         struct rfcomm_dlc       *dlc;
         struct tty_struct       *tty;
         wait_queue_head_t       wait;
-        struct tasklet_struct   wakeup_task;
+        struct work_struct      wakeup_task;
 
         struct device           *tty_dev;
 
@@ -81,7 +82,7 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb);
 static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err);
 static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig);
 
-static void rfcomm_tty_wakeup(unsigned long arg);
+static void rfcomm_tty_wakeup(struct work_struct *work);
 
 /* ---- Device functions ---- */
 static void rfcomm_dev_destruct(struct rfcomm_dev *dev)
@@ -133,13 +134,10 @@ static inline void rfcomm_dev_put(struct rfcomm_dev *dev)
 static struct rfcomm_dev *__rfcomm_dev_get(int id)
 {
         struct rfcomm_dev *dev;
-        struct list_head  *p;
 
-        list_for_each(p, &rfcomm_dev_list) {
-                dev = list_entry(p, struct rfcomm_dev, list);
+        list_for_each_entry(dev, &rfcomm_dev_list, list)
                 if (dev->id == id)
                         return dev;
-        }
 
         return NULL;
 }
@@ -197,7 +195,7 @@ static DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);
 
 static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
 {
-        struct rfcomm_dev *dev;
+        struct rfcomm_dev *dev, *entry;
         struct list_head *head = &rfcomm_dev_list, *p;
         int err = 0;
 
@@ -212,8 +210,8 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
         if (req->dev_id < 0) {
                 dev->id = 0;
 
-                list_for_each(p, &rfcomm_dev_list) {
-                        if (list_entry(p, struct rfcomm_dev, list)->id != dev->id)
+                list_for_each_entry(entry, &rfcomm_dev_list, list) {
+                        if (entry->id != dev->id)
                                 break;
 
                         dev->id++;
@@ -222,9 +220,7 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
         } else {
                 dev->id = req->dev_id;
 
-                list_for_each(p, &rfcomm_dev_list) {
-                        struct rfcomm_dev *entry = list_entry(p, struct rfcomm_dev, list);
-
+                list_for_each_entry(entry, &rfcomm_dev_list, list) {
                         if (entry->id == dev->id) {
                                 err = -EADDRINUSE;
                                 goto out;
@@ -257,7 +253,7 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
         atomic_set(&dev->opened, 0);
 
         init_waitqueue_head(&dev->wait);
-        tasklet_init(&dev->wakeup_task, rfcomm_tty_wakeup, (unsigned long) dev);
+        INIT_WORK(&dev->wakeup_task, rfcomm_tty_wakeup);
 
         skb_queue_head_init(&dev->pending);
 
@@ -351,7 +347,7 @@ static void rfcomm_wfree(struct sk_buff *skb)
         struct rfcomm_dev *dev = (void *) skb->sk;
         atomic_sub(skb->truesize, &dev->wmem_alloc);
         if (test_bit(RFCOMM_TTY_ATTACHED, &dev->flags))
-                tasklet_schedule(&dev->wakeup_task);
+                queue_work(system_nrt_wq, &dev->wakeup_task);
         rfcomm_dev_put(dev);
 }
 
@@ -455,9 +451,9 @@ static int rfcomm_release_dev(void __user *arg)
 
 static int rfcomm_get_dev_list(void __user *arg)
 {
+        struct rfcomm_dev *dev;
         struct rfcomm_dev_list_req *dl;
         struct rfcomm_dev_info *di;
-        struct list_head *p;
         int n = 0, size, err;
         u16 dev_num;
 
@@ -479,8 +475,7 @@ static int rfcomm_get_dev_list(void __user *arg)
 
         read_lock_bh(&rfcomm_dev_lock);
 
-        list_for_each(p, &rfcomm_dev_list) {
-                struct rfcomm_dev *dev = list_entry(p, struct rfcomm_dev, list);
+        list_for_each_entry(dev, &rfcomm_dev_list, list) {
                 if (test_bit(RFCOMM_TTY_RELEASED, &dev->flags))
                         continue;
                 (di + n)->id      = dev->id;
@@ -635,9 +630,10 @@ static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig)
 }
 
 /* ---- TTY functions ---- */
-static void rfcomm_tty_wakeup(unsigned long arg)
+static void rfcomm_tty_wakeup(struct work_struct *work)
 {
-        struct rfcomm_dev *dev = (void *) arg;
+        struct rfcomm_dev *dev = container_of(work, struct rfcomm_dev,
+                                                                wakeup_task);
         struct tty_struct *tty = dev->tty;
         if (!tty)
                 return;
@@ -762,7 +758,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
                 rfcomm_dlc_close(dev->dlc, 0);
 
                 clear_bit(RFCOMM_TTY_ATTACHED, &dev->flags);
-                tasklet_kill(&dev->wakeup_task);
+                cancel_work_sync(&dev->wakeup_task);
 
                 rfcomm_dlc_lock(dev->dlc);
                 tty->driver_data = NULL;
@@ -1155,9 +1151,11 @@ static const struct tty_operations rfcomm_ops = {
 
 int __init rfcomm_init_ttys(void)
 {
+        int error;
+
         rfcomm_tty_driver = alloc_tty_driver(RFCOMM_TTY_PORTS);
         if (!rfcomm_tty_driver)
-                return -1;
+                return -ENOMEM;
 
         rfcomm_tty_driver->owner        = THIS_MODULE;
         rfcomm_tty_driver->driver_name  = "rfcomm";
@@ -1172,10 +1170,11 @@ int __init rfcomm_init_ttys(void)
         rfcomm_tty_driver->init_termios.c_lflag &= ~ICANON;
         tty_set_operations(rfcomm_tty_driver, &rfcomm_ops);
 
-        if (tty_register_driver(rfcomm_tty_driver)) {
+        error = tty_register_driver(rfcomm_tty_driver);
+        if (error) {
                 BT_ERR("Can't register RFCOMM TTY driver");
                 put_tty_driver(rfcomm_tty_driver);
-                return -1;
+                return error;
         }
 
         BT_INFO("RFCOMM TTY layer initialized");