From: Caleb Connolly <caleb.connolly@linaro.org>
To: caleb.connolly@linaro.org, Marcel Holtmann <marcel@holtmann.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH] bluetooth: hci_event: don't print an error on vendor events
Date: Wed, 2 Mar 2022 18:23:52 +0000 [thread overview]
Message-ID: <20220302182352.441352-1-caleb.connolly@linaro.org> (raw)
Since commit 3e54c5890c87 ("Bluetooth: hci_event: Use of a function table to handle HCI events"),
some devices see errors being printed for vendor events, e.g.
[ 75.806141] Bluetooth: hci0: setting up wcn399x
[ 75.948311] Bluetooth: hci0: unexpected event 0xff length: 14 > 0
[ 75.955552] Bluetooth: hci0: QCA Product ID :0x0000000a
[ 75.961369] Bluetooth: hci0: QCA SOC Version :0x40010214
[ 75.967417] Bluetooth: hci0: QCA ROM Version :0x00000201
[ 75.973363] Bluetooth: hci0: QCA Patch Version:0x00000001
[ 76.000289] Bluetooth: hci0: QCA controller version 0x02140201
[ 76.006727] Bluetooth: hci0: QCA Downloading qca/crbtfw21.tlv
[ 76.986850] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.013574] Bluetooth: hci0: QCA Downloading qca/oneplus6/crnv21.bin
[ 77.024302] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.032681] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.040674] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.049251] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.057997] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.066320] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.075065] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.083073] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.091250] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.099417] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.110166] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.118672] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.127449] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.137190] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.146192] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.154242] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.163183] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.171202] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.179364] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.187259] Bluetooth: hci0: unexpected event 0xff length: 3 > 0
[ 77.198451] Bluetooth: hci0: QCA setup on UART is completed
Use the quick-return path in hci_event_func() to avoid printing this
message for vendor events, this reverts to the previous behaviour which
didn't print an error for vendor events.
Fixes: 3e54c5890c87 ("Bluetooth: hci_event: Use of a function table to handle HCI events")
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
net/bluetooth/hci_event.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fc30f4c03d29..56cc41ea9f31 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6809,7 +6809,7 @@ static void hci_event_func(struct hci_dev *hdev, u8 event, struct sk_buff *skb,
const struct hci_ev *ev = &hci_ev_table[event];
void *data;
- if (!ev->func)
+ if (!ev->func || event == HCI_EV_VENDOR)
return;
if (skb->len < ev->min_len) {
--
2.35.1
next reply other threads:[~2022-03-02 18:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-02 18:23 Caleb Connolly [this message]
2022-03-02 19:16 ` [PATCH] bluetooth: hci_event: don't print an error on vendor events Marcel Holtmann
2022-03-02 19:18 ` Caleb Connolly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220302182352.441352-1-caleb.connolly@linaro.org \
--to=caleb.connolly@linaro.org \
--cc=davem@davemloft.net \
--cc=johan.hedberg@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).