Hi Marcel, I have just rebased onto bluetooth-next/master (commit e2e03d27190561976f2631c36337299645f7c1a2 from Dec 3) - oddly, I didn't have any conflicts in my rebase. Please let me know if the issue continues. Thanks! Daniel On Thu, Dec 3, 2020 at 4:47 AM Marcel Holtmann <marcel@xxxxxxxxxxxx> wrote: > > Hi Daniel, > > > This patch series defines the new two-call MGMT interface for adding > > new advertising instances. Similarly to the hci advertising commands, a > > mgmt call to set parameters is expected to be first, followed by a mgmt > > call to set advertising data/scan response. The members of the > > parameters request are optional; the caller defines a "params" bitfield > > in the structure that indicates which parameters were intentionally set, > > and others are set to defaults. > > > > The main feature here is the introduction of min/max parameters and tx > > power that can be requested by the client. Min/max parameters will be > > used both with and without extended advertising support, and tx power > > will be used with extended advertising support. After a call to set > > advertising parameters, the selected transmission power will be > > propagated in the reponse to alert userspace to the actual power used. > > > > Additionally, to inform userspace of the controller LE Tx power > > capabilities for the client's benefit, this series also changes the > > security info MGMT command to more flexibly contain other capabilities, > > such as LE min and max tx power. > > > > All changes have been tested on hatch (extended advertising) and kukui > > (no extended advertising) chromebooks with manual testing verifying > > correctness of parameters/data in btmon traces, and our automated test > > suite of 25 single- and multi-advertising usage scenarios. > > > > A separate patch series will add support in bluetoothd. Thanks in > > advance for your feedback! > > > > Daniel Winkler > > > > > > Changes in v6: > > - Only populate LE tx power range if controller reports it > > > > Changes in v5: > > - Ensure data/scan rsp length is returned for non-ext adv > > > > Changes in v4: > > - Add remaining data and scan response length to MGMT params response > > - Moving optional params into 'flags' field of MGMT command > > - Combine LE tx range into a single EIR field for MGMT capabilities cmd > > > > Changes in v3: > > - Adding selected tx power to adv params mgmt response, removing event > > - Re-using security info MGMT command to carry controller capabilities > > > > Changes in v2: > > - Fixed sparse error in Capabilities MGMT command > > > > Daniel Winkler (5): > > Bluetooth: Add helper to set adv data > > Bluetooth: Break add adv into two mgmt commands > > Bluetooth: Use intervals and tx power from mgmt cmds > > Bluetooth: Query LE tx power on startup > > Bluetooth: Change MGMT security info CMD to be more generic > > > > include/net/bluetooth/hci.h | 7 + > > include/net/bluetooth/hci_core.h | 12 +- > > include/net/bluetooth/mgmt.h | 49 +++- > > net/bluetooth/hci_core.c | 47 +++- > > net/bluetooth/hci_event.c | 19 ++ > > net/bluetooth/hci_request.c | 29 ++- > > net/bluetooth/mgmt.c | 430 +++++++++++++++++++++++++++++-- > > 7 files changed, 548 insertions(+), 45 deletions(-) > > I am having problem with patch 3/5 which does not apply cleanly against bluetooth-next. Can you please fix it and re-send. Thanks. > > Regards > > Marcel >