Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Bluetooth: hci_core: Fix LE quote calculation"

Browse source 
This reverts commit bafa10dcb6.
This commit is contained in:
Ksawlii 2024-11-24 00:23:52 +01:00
parent 0c4e79d991
commit b59cf7d671
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
net/bluetooth/hci_core.c
View file

@ -4682,19 +4682,19 @@ static void hci_sched_le(struct hci_dev *hdev)
{ {
struct hci_chan *chan; struct hci_chan *chan;
struct sk_buff *skb; struct sk_buff *skb;
int quote, *cnt, tmp; int quote, cnt, tmp;
BT_DBG("%s", hdev->name); BT_DBG("%s", hdev->name);
if (!hci_conn_num(hdev, LE_LINK)) if (!hci_conn_num(hdev, LE_LINK))
return; return;
cnt = hdev->le_pkts ? &hdev->le_cnt : &hdev->acl_cnt; cnt = hdev->le_pkts ? hdev->le_cnt : hdev->acl_cnt;
__check_timeout(hdev, *cnt, LE_LINK); __check_timeout(hdev, cnt, LE_LINK);
tmp = *cnt; tmp = cnt;
while (*cnt && (chan = hci_chan_sent(hdev, LE_LINK, &quote))) { while (cnt && (chan = hci_chan_sent(hdev, LE_LINK, &quote))) {
u32 priority = (skb_peek(&chan->data_q))->priority; u32 priority = (skb_peek(&chan->data_q))->priority;
while (quote-- && (skb = skb_peek(&chan->data_q))) { while (quote-- && (skb = skb_peek(&chan->data_q))) {
BT_DBG("chan %p skb %p len %d priority %u", chan, skb, BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
@ -4709,7 +4709,7 @@ static void hci_sched_le(struct hci_dev *hdev)
hci_send_frame(hdev, skb); hci_send_frame(hdev, skb);
hdev->le_last_tx = jiffies; hdev->le_last_tx = jiffies;
(*cnt)--; cnt--;
chan->sent++; chan->sent++;
chan->conn->sent++; chan->conn->sent++;
@ -4719,7 +4719,12 @@ static void hci_sched_le(struct hci_dev *hdev)
} }
} }
if (*cnt != tmp) if (hdev->le_pkts)
hdev->le_cnt = cnt;
else
hdev->acl_cnt = cnt;
if (cnt != tmp)
hci_prio_recalculate(hdev, LE_LINK); hci_prio_recalculate(hdev, LE_LINK);
} }