X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fbluetooth%2Fhci_sysfs.c;h=0ed38740388c374262d90edac9eff42741a0e0da;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=1b8039fb463f67230869f4d7b8aaedaaf974a884;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 1b8039fb4..0ed387403 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -48,14 +48,14 @@ static ssize_t show_inquiry_cache(struct class_device *cdev, char *buf)
 	hci_dev_lock_bh(hdev);
 
 	for (e = cache->list; e; e = e->next) {
-		struct inquiry_info *info = &e->info;
+		struct inquiry_data *data = &e->data;
 		bdaddr_t bdaddr;
-		baswap(&bdaddr, &info->bdaddr);
-		n += sprintf(buf + n, "%s %d %d %d 0x%.2x%.2x%.2x 0x%.4x 0x%.2x %u\n",
+		baswap(&bdaddr, &data->bdaddr);
+		n += sprintf(buf + n, "%s %d %d %d 0x%.2x%.2x%.2x 0x%.4x %d %u\n",
 				batostr(&bdaddr),
-				info->pscan_rep_mode, info->pscan_period_mode, info->pscan_mode,
-				info->dev_class[2], info->dev_class[1], info->dev_class[0],
-				info->clock_offset, 0, e->timestamp);
+				data->pscan_rep_mode, data->pscan_period_mode, data->pscan_mode,
+				data->dev_class[2], data->dev_class[1], data->dev_class[0],
+				__le16_to_cpu(data->clock_offset), data->rssi, e->timestamp);
 	}
 
 	hci_dev_unlock_bh(hdev);
@@ -78,7 +78,7 @@ static struct class_device_attribute *bt_attrs[] = {
 };
 
 #ifdef CONFIG_HOTPLUG
-static int bt_hotplug(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
+static int bt_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
 {
 	struct hci_dev *hdev = class_get_devdata(cdev);
 	int n, i = 0;
@@ -91,7 +91,7 @@ static int bt_hotplug(struct class_device *cdev, char **envp, int num_envp, char
 	if ((size <= 0) || (i >= num_envp))
 		return -ENOMEM;
 
-	envp[i] = 0;
+	envp[i] = NULL;
 	return 0;
 }
 #endif
@@ -103,18 +103,21 @@ static void bt_release(struct class_device *cdev)
 	kfree(hdev);
 }
 
-static struct class bt_class = {
+struct class bt_class = {
 	.name		= "bluetooth",
 	.release	= bt_release,
 #ifdef CONFIG_HOTPLUG
-	.hotplug	= bt_hotplug,
+	.uevent		= bt_uevent,
 #endif
 };
 
+EXPORT_SYMBOL_GPL(bt_class);
+
 int hci_register_sysfs(struct hci_dev *hdev)
 {
 	struct class_device *cdev = &hdev->class_dev;
-	int i, err;
+	unsigned int i;
+	int err;
 
 	BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);