Bluetooth: Add TX power tag to EIR data

The Inquiry Response TX power tag should be added to the Extended
Inquiry Data (EIR) as well.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index d47e523c9d83387460f905414952d81c54b8361e..3edb3e759ffe45677d4eee537545be880f1e3c8a 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -717,6 +717,10 @@ struct hci_rp_read_local_oob_data {
 } __packed;
 
 #define HCI_OP_READ_INQ_RSP_TX_POWER   0x0c58
+struct hci_rp_read_inq_rsp_tx_power {
+       __u8     status;
+       __s8     tx_power;
+} __packed;
 
 #define HCI_OP_READ_FLOW_CONTROL_MODE  0x0c66
 struct hci_rp_read_flow_control_mode {

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c80a9684a14482ccbf30f4da6ee5ffcfb9de1ec6..ce09bf1592e23ecfbde6838230c4fe8ffb2bceec 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -158,6 +158,7 @@ struct hci_dev {
        __u16           lmp_subver;
        __u16           voice_setting;
        __u8            io_capability;
+       __s8            inq_tx_power;
 
        __u16           pkt_type;
        __u16           esco_type;

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 50ff9a9895314dfd346295327e0ae2f848db83e5..75f01d1b126f28db683a7a7db363071e3a99ec59 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -887,11 +887,14 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
 static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
                                                        struct sk_buff *skb)
 {
-       __u8 status = *((__u8 *) skb->data);
+       struct hci_rp_read_inq_rsp_tx_power *rp = (void *) skb->data;
 
-       BT_DBG("%s status 0x%x", hdev->name, status);
+       BT_DBG("%s status 0x%x", hdev->name, rp->status);
+
+       if (!rp->status)
+               hdev->inq_tx_power = rp->tx_power;
 
-       hci_req_complete(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, status);
+       hci_req_complete(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, rp->status);
 }
 
 static void hci_cc_set_event_flt(struct hci_dev *hdev, struct sk_buff *skb)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4a2fb06226fcfbc73a819888dbf1ba74a2e0a04c..02b89e299ff8d561fdbd0878edbe5993a83b0fbb 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -479,6 +479,15 @@ static void create_eir(struct hci_dev *hdev, u8 *data)
                ptr += (name_len + 2);
        }
 
+       if (hdev->inq_tx_power) {
+               ptr[0] = 2;
+               ptr[1] = EIR_TX_POWER;
+               ptr[2] = (u8) hdev->inq_tx_power;
+
+               eir_len += 3;
+               ptr += 3;
+       }
+
        memset(uuid16_list, 0, sizeof(uuid16_list));
 
        /* Group all UUID16 types */