Bluetooth: make batostr() print in the right order

The Bluetooth core uses the the BD_ADDR in the opposite order from the
human readable order. So we are changing batostr() to print in the
correct order and then removing some baswap(), as they are not needed
anymore.

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index d4616060a196c500962e5119bd9c98e649d9cd21..ec0a1347f933cbdb9ca70be4f869d459f0ec9565 100644 (file)
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -321,13 +321,10 @@ static int cmtp_session(void *arg)
 int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
 {
        struct cmtp_session *session, *s;
-       bdaddr_t dst;
        int i, err;
 
        BT_DBG("");
 
-       baswap(&dst, &bt_sk(sock->sk)->dst);
-
        session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
        if (!session)
                return -ENOMEM;
@@ -346,7 +343,7 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
 
        BT_DBG("mtu %d", session->mtu);
 
-       sprintf(session->name, "%s", batostr(&dst));
+       sprintf(session->name, "%s", batostr(&bt_sk(sock->sk)->dst));
 
        session->sock  = sock;
        session->state = BT_CONFIG;

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 1a9f0db027da006135458f5b1f4f8419e79ee976..5fce3d6d07b4acc2a656b367121b06478c92061e 100644 (file)
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -37,9 +37,7 @@ static ssize_t show_link_type(struct device *dev, struct device_attribute *attr,
 static ssize_t show_link_address(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct hci_conn *conn = dev_get_drvdata(dev);
-       bdaddr_t bdaddr;
-       baswap(&bdaddr, &conn->dst);
-       return sprintf(buf, "%s\n", batostr(&bdaddr));
+       return sprintf(buf, "%s\n", batostr(&conn->dst));
 }
 
 static ssize_t show_link_features(struct device *dev, struct device_attribute *attr, char *buf)
@@ -238,9 +236,7 @@ static ssize_t show_class(struct device *dev, struct device_attribute *attr, cha
 static ssize_t show_address(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct hci_dev *hdev = dev_get_drvdata(dev);
-       bdaddr_t bdaddr;
-       baswap(&bdaddr, &hdev->bdaddr);
-       return sprintf(buf, "%s\n", batostr(&bdaddr));
+       return sprintf(buf, "%s\n", batostr(&hdev->bdaddr));
 }
 
 static ssize_t show_features(struct device *dev, struct device_attribute *attr, char *buf)
@@ -408,10 +404,8 @@ static int inquiry_cache_show(struct seq_file *f, void *p)
 
        for (e = cache->list; e; e = e->next) {
                struct inquiry_data *data = &e->data;
-               bdaddr_t bdaddr;
-               baswap(&bdaddr, &data->bdaddr);
                seq_printf(f, "%s %d %d %d 0x%.2x%.2x%.2x 0x%.4x %d %d %u\n",
-                          batostr(&bdaddr),
+                          batostr(&data->bdaddr),
                           data->pscan_rep_mode, data->pscan_period_mode,
                           data->pscan_mode, data->dev_class[2],
                           data->dev_class[1], data->dev_class[0],
@@ -445,13 +439,10 @@ static int blacklist_show(struct seq_file *f, void *p)
 
        list_for_each(l, &hdev->blacklist) {
                struct bdaddr_list *b;
-               bdaddr_t bdaddr;
 
                b = list_entry(l, struct bdaddr_list, list);
 
-               baswap(&bdaddr, &b->bdaddr);
-
-               seq_printf(f, "%s\n", batostr(&bdaddr));
+               seq_printf(f, "%s\n", batostr(&b->bdaddr));
        }
 
        hci_dev_unlock_bh(hdev);

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index bfe641b7dfaf0e0ba70fa604ebffec7155cbaec8..c0ee8b3928ed9b97eeaf7ef8d195a222bc2a3225 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -758,7 +758,6 @@ static int hidp_setup_hid(struct hidp_session *session,
                                struct hidp_connadd_req *req)
 {
        struct hid_device *hid;
-       bdaddr_t src, dst;
        int err;
 
        session->rd_data = kzalloc(req->rd_size, GFP_KERNEL);
@@ -781,9 +780,6 @@ static int hidp_setup_hid(struct hidp_session *session,
 
        hid->driver_data = session;
 
-       baswap(&src, &bt_sk(session->ctrl_sock->sk)->src);
-       baswap(&dst, &bt_sk(session->ctrl_sock->sk)->dst);
-
        hid->bus     = BUS_BLUETOOTH;
        hid->vendor  = req->vendor;
        hid->product = req->product;
@@ -791,8 +787,8 @@ static int hidp_setup_hid(struct hidp_session *session,
        hid->country = req->country;
 
        strncpy(hid->name, req->name, 128);
-       strncpy(hid->phys, batostr(&src), 64);
-       strncpy(hid->uniq, batostr(&dst), 64);
+       strncpy(hid->phys, batostr(&bt_sk(session->ctrl_sock->sk)->src), 64);
+       strncpy(hid->uniq, batostr(&bt_sk(session->ctrl_sock->sk)->dst), 64);
 
        hid->dev.parent = hidp_get_device(session);
        hid->ll_driver = &hidp_hid_driver;

diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c
index ad2af5814e40163e0e21e4c82a5a760e9e404894..b826d1bf10df5ce53f9674a061a65e940af73913 100644 (file)
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -51,8 +51,8 @@ char *batostr(bdaddr_t *ba)
 
        i ^= 1;
        sprintf(str[i], "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
-               ba->b[0], ba->b[1], ba->b[2],
-               ba->b[3], ba->b[4], ba->b[5]);
+               ba->b[5], ba->b[4], ba->b[3],
+               ba->b[2], ba->b[1], ba->b[0]);
 
        return str[i];
 }

diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index befc3a52aa04ba2c03a7d367d86766e40de0950f..26461639f133499f1698488c162c7bd79831b8c0 100644 (file)
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -183,9 +183,7 @@ static struct device *rfcomm_get_device(struct rfcomm_dev *dev)
 static ssize_t show_address(struct device *tty_dev, struct device_attribute *attr, char *buf)
 {
        struct rfcomm_dev *dev = dev_get_drvdata(tty_dev);
-       bdaddr_t bdaddr;
-       baswap(&bdaddr, &dev->dst);
-       return sprintf(buf, "%s\n", batostr(&bdaddr));
+       return sprintf(buf, "%s\n", batostr(&dev->dst));
 }
 
 static ssize_t show_channel(struct device *tty_dev, struct device_attribute *attr, char *buf)