Grzegorz Kolodziejczyk (1):
monitor: Fix invalid Create BIG Test command
Jakub Tyszkowski (1):
monitor: Fix adv_handle size in the set info transfer packet
Łukasz Rymanowski (2):
btmon: Fix obvious typo
btmon: Make BIG identifier consistent
monitor/bt.h | 9 ++++-----
monitor/packet.c | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
--
2.34.1
From: Grzegorz Kolodziejczyk <[email protected]>
As per Bluetooth Core 5.4 Vol 4 Part E, 7.8.104,
max pdu is 2 octect long and there is no adv_handle before encyption
flag
---
monitor/bt.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/monitor/bt.h b/monitor/bt.h
index 131024e46..ea24a076e 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -2777,14 +2777,13 @@ struct bt_hci_bis_test {
uint16_t iso_interval;
uint8_t nse;
uint16_t sdu;
- uint8_t pdu;
+ uint16_t pdu;
uint8_t phy;
uint8_t packing;
uint8_t framing;
uint8_t bn;
uint8_t irc;
uint8_t pto;
- uint8_t adv_handle;
uint8_t encryption;
uint8_t bcode[16];
} __attribute__ ((packed));
--
2.34.1
Bluetooth spec uses BIG Handle as a BIG identifier.
Btmon sometimes use this and sometimes BIG ID.
This patch makes code consistent
---
monitor/bt.h | 4 ++--
monitor/packet.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/monitor/bt.h b/monitor/bt.h
index ea24a076e..b60263fa0 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -2789,7 +2789,7 @@ struct bt_hci_bis_test {
} __attribute__ ((packed));
struct bt_hci_cmd_le_create_big_test {
- uint8_t big_id;
+ uint8_t big_handle;
uint8_t adv_handle;
uint8_t num_bis;
struct bt_hci_bis_test bis[0];
@@ -3676,7 +3676,7 @@ struct bt_hci_evt_le_big_sync_estabilished {
#define BT_HCI_EVT_LE_BIG_SYNC_LOST 0x1e
struct bt_hci_evt_le_big_sync_lost {
- uint8_t big_id;
+ uint8_t big_handle;
uint8_t reason;
} __attribute__ ((packed));
diff --git a/monitor/packet.c b/monitor/packet.c
index fd1e9e034..f581a8e72 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -8811,7 +8811,7 @@ static void le_create_big_cmd_test_cmd(uint16_t index, const void *data,
{
const struct bt_hci_cmd_le_create_big_test *cmd = data;
- print_field("BIG ID: 0x%2.2x", cmd->big_id);
+ print_field("BIG Handle: 0x%2.2x", cmd->big_handle);
print_field("Advertising Handle: 0x%2.2x", cmd->adv_handle);
print_field("Number of BIS: %u", cmd->num_bis);
@@ -11633,7 +11633,7 @@ static void le_big_sync_lost_evt(struct timeval *tv, uint16_t index,
{
const struct bt_hci_evt_le_big_sync_lost *evt = data;
- print_field("BIG ID: 0x%2.2x", evt->big_id);
+ print_field("BIG Handle: 0x%2.2x", evt->big_handle);
print_reason(evt->reason);
}
--
2.34.1
---
monitor/packet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/monitor/packet.c b/monitor/packet.c
index f2167fb52..fd1e9e034 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -11593,7 +11593,7 @@ static void le_big_complete_evt(struct timeval *tv, uint16_t index,
print_le_phy("PHY", evt->phy);
print_field("NSE: %u", evt->nse);
print_field("BN: %u", evt->bn);
- print_field("PTO: %u", evt->bn);
+ print_field("PTO: %u", evt->pto);
print_field("IRC: %u", evt->irc);
print_field("Maximum PDU: %u", evt->max_pdu);
print_slot_125("ISO Interval", evt->interval);
--
2.34.1
Hello:
This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Fri, 21 Jul 2023 14:03:16 +0200 you wrote:
> Grzegorz Kolodziejczyk (1):
> monitor: Fix invalid Create BIG Test command
>
> Jakub Tyszkowski (1):
> monitor: Fix adv_handle size in the set info transfer packet
>
> Łukasz Rymanowski (2):
> btmon: Fix obvious typo
> btmon: Make BIG identifier consistent
>
> [...]
Here is the summary with links:
- [BlueZ,1/4] monitor: Fix adv_handle size in the set info transfer packet
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=4337eb25b04c
- [BlueZ,2/4] monitor: Fix invalid Create BIG Test command
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=cc9f3a8e510a
- [BlueZ,3/4] btmon: Fix obvious typo
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=aee361c8eb0f
- [BlueZ,4/4] btmon: Make BIG identifier consistent
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=d8ca06631b74
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html