summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKiran K <kiran.k@intel.com>2024-10-17 17:21:56 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-05 14:01:58 +0100
commit90fe2941f54e0250c15bd6bd3f24082c7ebf3fa1 (patch)
tree89df390fdb174c579067011f62b6456b44cf0690 /drivers
parentc670ebfd82585f74efe81c91a2d4580f8873acb0 (diff)
downloadlinux-90fe2941f54e0250c15bd6bd3f24082c7ebf3fa1.tar.gz
linux-90fe2941f54e0250c15bd6bd3f24082c7ebf3fa1.tar.bz2
linux-90fe2941f54e0250c15bd6bd3f24082c7ebf3fa1.zip
Bluetooth: btintel: Do no pass vendor events to stack
[ Upstream commit 510e8380b0382ee3b070748656b00f83c9a5bf80 ] 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: 3368aa357f3b ("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bluetooth/btintel.c6
-rw-r--r--drivers/bluetooth/btintel_pcie.c9
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 4b17202075b0..645047fb92fd 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -3368,7 +3368,8 @@ int btintel_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
* indicating that the bootup completed.
*/
btintel_bootup(hdev, ptr, len);
- break;
+ kfree_skb(skb);
+ return 0;
case 0x06:
/* When the firmware loading completes the
* device sends out a vendor specific event
@@ -3376,7 +3377,8 @@ int btintel_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
* loading.
*/
btintel_secure_send_result(hdev, ptr, len);
- break;
+ kfree_skb(skb);
+ return 0;
}
}
diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c
index 16ee962d4086..8bd663f4bac1 100644
--- a/drivers/bluetooth/btintel_pcie.c
+++ b/drivers/bluetooth/btintel_pcie.c
@@ -536,7 +536,8 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
if (btintel_pcie_in_op(data)) {
btintel_pcie_wr_sleep_cntrl(data, BTINTEL_PCIE_STATE_D0);
data->alive_intr_ctxt = BTINTEL_PCIE_INTEL_HCI_RESET2;
- break;
+ kfree_skb(skb);
+ return 0;
}
if (btintel_pcie_in_iml(data)) {
@@ -553,7 +554,8 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
btintel_wake_up_flag(data->hdev,
INTEL_WAIT_FOR_D0);
}
- break;
+ kfree_skb(skb);
+ return 0;
case 0x06:
/* When the firmware loading completes the
* device sends out a vendor specific event
@@ -561,7 +563,8 @@ static int btintel_pcie_recv_event(struct hci_dev *hdev, struct sk_buff *skb)
* loading.
*/
btintel_secure_send_result(hdev, ptr, len);
- break;
+ kfree_skb(skb);
+ return 0;
}
}