Skip to content

Commit 510e838

Browse files
kirankrishnappa-intelVudentz
authored andcommitted
Bluetooth: btintel: Do no pass vendor events to stack
During firmware download, vendor specific events like boot up and secure send result are generated. These events can be safely processed at the driver level. Passing on these events to stack prints unnecessary log as below. Bluetooth: hci0: Malformed MSFT vendor event: 0x02 Fixes: 3368aa3 ("Bluetooth: msft: Handle MSFT Monitor Device Event") Signed-off-by: Kiran K <kiran.k@intel.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
1 parent 9b49561 commit 510e838

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

drivers/bluetooth/btintel.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -3395,15 +3395,17 @@ int btintel_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
33953395
* indicating that the bootup completed.
33963396
*/
33973397
btintel_bootup(hdev, ptr, len);
3398-
break;
3398+
kfree_skb(skb);
3399+
return 0;
33993400
case 0x06:
34003401
/* When the firmware loading completes the
34013402
* device sends out a vendor specific event
34023403
* indicating the result of the firmware
34033404
* loading.
34043405
*/
34053406
btintel_secure_send_result(hdev, ptr, len);
3406-
break;
3407+
kfree_skb(skb);
3408+
return 0;
34073409
}
34083410
}
34093411

drivers/bluetooth/btintel_pcie.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,8 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
550550
if (btintel_pcie_in_op(data)) {
551551
btintel_pcie_wr_sleep_cntrl(data, BTINTEL_PCIE_STATE_D0);
552552
data->alive_intr_ctxt = BTINTEL_PCIE_INTEL_HCI_RESET2;
553-
break;
553+
kfree_skb(skb);
554+
return 0;
554555
}
555556

556557
if (btintel_pcie_in_iml(data)) {
@@ -567,15 +568,17 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
567568
btintel_wake_up_flag(data->hdev,
568569
INTEL_WAIT_FOR_D0);
569570
}
570-
break;
571+
kfree_skb(skb);
572+
return 0;
571573
case 0x06:
572574
/* When the firmware loading completes the
573575
* device sends out a vendor specific event
574576
* indicating the result of the firmware
575577
* loading.
576578
*/
577579
btintel_secure_send_result(hdev, ptr, len);
578-
break;
580+
kfree_skb(skb);
581+
return 0;
579582
}
580583
}
581584

0 commit comments

Comments
 (0)