1 files changed, 24 insertions, 12 deletions

diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 74368f79ee5d..26f322737db0 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -27,7 +27,6 @@
  * $Id: tty.c,v 1.24 2002/10/03 01:54:38 holtmann Exp $
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 
 #include <linux/tty.h>
@@ -39,6 +38,7 @@
 #include <linux/skbuff.h>
 
 #include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/rfcomm.h>
 
 #ifndef CONFIG_BT_RFCOMM_DEBUG
@@ -162,6 +162,24 @@ static inline struct rfcomm_dev *rfcomm_dev_get(int id)
         return dev;
 }
 
+static struct device *rfcomm_get_device(struct rfcomm_dev *dev)
+{
+        struct hci_dev *hdev;
+        struct hci_conn *conn;
+
+        hdev = hci_get_route(&dev->dst, &dev->src);
+        if (!hdev)
+                return NULL;
+
+        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &dev->dst);
+        if (!conn)
+                return NULL;
+
+        hci_dev_put(hdev);
+
+        return &conn->dev;
+}
+
 static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
 {
         struct rfcomm_dev *dev;
@@ -170,10 +188,9 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
 
         BT_DBG("id %d channel %d", req->dev_id, req->channel);
         
-        dev = kmalloc(sizeof(struct rfcomm_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct rfcomm_dev), GFP_KERNEL);
         if (!dev)
                 return -ENOMEM;
-        memset(dev, 0, sizeof(struct rfcomm_dev));
 
         write_lock_bh(&rfcomm_dev_lock);
 
@@ -246,7 +263,7 @@ out:
                 return err;
         }
 
-        tty_register_device(rfcomm_tty_driver, dev->id, NULL);
+        tty_register_device(rfcomm_tty_driver, dev->id, rfcomm_get_device(dev));
 
         return dev->id;
 }
@@ -480,12 +497,8 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb)
 
         BT_DBG("dlc %p tty %p len %d", dlc, tty, skb->len);
 
-        if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
-                tty_buffer_request_room(tty, skb->len);
-                tty_insert_flip_string(tty, skb->data, skb->len);
-                tty_flip_buffer_push(tty);
-        } else
-                tty->ldisc.receive_buf(tty, skb->data, NULL, skb->len);
+        tty_insert_flip_string(tty, skb->data, skb->len);
+        tty_flip_buffer_push(tty);
 
         kfree_skb(skb);
 }
@@ -1025,13 +1038,12 @@ int rfcomm_init_ttys(void)
 
         rfcomm_tty_driver->owner        = THIS_MODULE;
         rfcomm_tty_driver->driver_name  = "rfcomm";
-        rfcomm_tty_driver->devfs_name   = "bluetooth/rfcomm/";
         rfcomm_tty_driver->name         = "rfcomm";
         rfcomm_tty_driver->major        = RFCOMM_TTY_MAJOR;
         rfcomm_tty_driver->minor_start  = RFCOMM_TTY_MINOR;
         rfcomm_tty_driver->type         = TTY_DRIVER_TYPE_SERIAL;
         rfcomm_tty_driver->subtype      = SERIAL_TYPE_NORMAL;
-        rfcomm_tty_driver->flags        = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        rfcomm_tty_driver->flags        = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         rfcomm_tty_driver->init_termios = tty_std_termios;
         rfcomm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
         tty_set_operations(rfcomm_tty_driver, &rfcomm_ops);