Bluetooth: Use hci_copy_identity_addr() helper for SMP chan creation
Subsystems (2)
PATCH 1/1 Bluetooth: Use hci_copy_identity_addr() helper for SMP chan creation
From: Johan Hedberg <[email protected]>
The only reason the SMP code is essentially duplicating the hci_copy_identity_addr() function is that the helper returns the address type in the HCI format rather than the three-value format expected by l2cap_chan. This patch converts the SMP code to use the helper and then do a simple conversion from one address type to another.
--- net/bluetooth/smp.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
net/bluetooth/smp.c +7 -17
@@ -2951,24 +2951,14 @@ create_chan:l2cap_chan_set_defaults (chan);if (cid ==L2CAP_CID_SMP ) { -/* If usage of static address is forced or if the devices -* does not have a public address, then listen on the static -* address. -* -* In case BR/EDR has been disabled on a dual-mode controller -* and a static address has been configued, then listen on -* the static address instead. -*/ -if (test_bit (HCI_FORCE_STATIC_ADDR , &hdev->dbg_flags) || - !bacmp (&hdev->bdaddr,BDADDR_ANY ) || - (!test_bit (HCI_BREDR_ENABLED , &hdev->dev_flags) && -bacmp (&hdev->static_addr,BDADDR_ANY ))) { -bacpy (&chan->src, &hdev->static_addr); - chan->src_type =BDADDR_LE_RANDOM ; - }else { -bacpy (&chan->src, &hdev->bdaddr); +u8 bdaddr_type; + +hci_copy_identity_address (hdev, &chan->src, &bdaddr_type); + +if (bdaddr_type ==ADDR_LE_DEV_PUBLIC ) chan->src_type =BDADDR_LE_PUBLIC ; - } +else + chan->src_type =BDADDR_LE_RANDOM ; }else {bacpy (&chan->src, &hdev->bdaddr); chan->src_type =BDADDR_BREDR ;
Signature · 1 line
2.1.0
Marcel Holtmann
maintainerHi Johan,
Quoted 10 lines
The only reason the SMP code is essentially duplicating the
hci_copy_identity_addr()function is that the helper returns the address type in the HCI format rather than the three-value format expected byl2cap_chan. This patch converts the SMP code to use the helper and then do a simple conversion from one address type to another.Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/smp.c| 24 +++++++-----------------1 file changed, 7 insertions(+), 17 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel