2008-02-18 07:54:26

by Dave Young

Subject: [PATCH 2/2] bluetooth : do not move child device other than rfcomm

hci conn child devices other than rfcomm tty should not be moved here.
This is my lost, thanks for Barnaby's reporting and testing.

Signed-off-by: Dave Young <[email protected]>

---
net/bluetooth/hci_sysfs.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)

diff -upr linux/net/bluetooth/hci_sysfs.c linux.new/net/bluetooth/hci_sysfs.c
--- linux/net/bluetooth/hci_sysfs.c 2008-02-16 06:38:56.000000000 +0800
+++ linux.new/net/bluetooth/hci_sysfs.c 2008-02-17 15:45:15.000000000 +0800
@@ -320,15 +320,14 @@ void hci_conn_add_sysfs(struct hci_conn
queue_work(btaddconn, &conn->work);
}

+/*
+ * The rfcomm tty device will possibly retain even when conn
+ * is down, and sysfs doesn't support move zombie device,
+ * so we should move the device before conn device is destroyed.
+ */
static int __match_tty(struct device *dev, void *data)
{
- /* The rfcomm tty device will possibly retain even when conn
- * is down, and sysfs doesn't support move zombie device,
- * so we should move the device before conn device is destroyed.
- * Due to the only child device of hci_conn dev is rfcomm
- * tty_dev, here just return 1
- */
- return 1;
+ return !strncmp(dev->bus_id, "rfcomm", 6);
}

static void del_conn(struct work_struct *work)

2008-02-19 04:45:29

by David Miller

Subject: Re: [PATCH 2/2] bluetooth : do not move child device other than rfcomm

From: Dave Young <[email protected]>
Date: Mon, 18 Feb 2008 15:58:05 +0800

> hci conn child devices other than rfcomm tty should not be moved here.
> This is my lost, thanks for Barnaby's reporting and testing.
>
> Signed-off-by: Dave Young <[email protected]>

Applied, thanks Dave.