Skip to content

Commit cdfcf9d

Browse files
sjancRobertCNelson
authored andcommitted
Bluetooth: Remove spurious error message
Even with rate limited reporting this is very spammy and since it is remote device that is providing bogus data there is no need to report this as error. Since real_len variable was used only to allow conditional error message it is now also removed. [72454.143336] bt_err_ratelimited: 10 callbacks suppressed [72454.143337] Bluetooth: hci0: advertising data len corrected [72454.296314] Bluetooth: hci0: advertising data len corrected [72454.892329] Bluetooth: hci0: advertising data len corrected [72455.051319] Bluetooth: hci0: advertising data len corrected [72455.357326] Bluetooth: hci0: advertising data len corrected [72455.663295] Bluetooth: hci0: advertising data len corrected [72455.787278] Bluetooth: hci0: advertising data len corrected [72455.942278] Bluetooth: hci0: advertising data len corrected [72456.094276] Bluetooth: hci0: advertising data len corrected [72456.249137] Bluetooth: hci0: advertising data len corrected [72459.416333] bt_err_ratelimited: 13 callbacks suppressed [72459.416334] Bluetooth: hci0: advertising data len corrected [72459.721334] Bluetooth: hci0: advertising data len corrected [72460.011317] Bluetooth: hci0: advertising data len corrected [72460.327171] Bluetooth: hci0: advertising data len corrected [72460.638294] Bluetooth: hci0: advertising data len corrected [72460.946350] Bluetooth: hci0: advertising data len corrected [72461.225320] Bluetooth: hci0: advertising data len corrected [72461.690322] Bluetooth: hci0: advertising data len corrected [72462.118318] Bluetooth: hci0: advertising data len corrected [72462.427319] Bluetooth: hci0: advertising data len corrected [72464.546319] bt_err_ratelimited: 7 callbacks suppressed [72464.546319] Bluetooth: hci0: advertising data len corrected [72464.857318] Bluetooth: hci0: advertising data len corrected [72465.163332] Bluetooth: hci0: advertising data len corrected [72465.278331] Bluetooth: hci0: advertising data len corrected [72465.432323] Bluetooth: hci0: advertising data len corrected [72465.891334] Bluetooth: hci0: advertising data len corrected [72466.045334] Bluetooth: hci0: advertising data len corrected [72466.197321] Bluetooth: hci0: advertising data len corrected [72466.340318] Bluetooth: hci0: advertising data len corrected [72466.498335] Bluetooth: hci0: advertising data len corrected [72469.803299] bt_err_ratelimited: 10 callbacks suppressed Signed-off-by: Szymon Janc <[email protected]> Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=203753 Cc: [email protected] Signed-off-by: Marcel Holtmann <[email protected]>
1 parent 8b7a36b commit cdfcf9d

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

net/bluetooth/hci_event.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5122,7 +5122,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
51225122
struct hci_conn *conn;
51235123
bool match;
51245124
u32 flags;
5125-
u8 *ptr, real_len;
5125+
u8 *ptr;
51265126

51275127
switch (type) {
51285128
case LE_ADV_IND:
@@ -5148,13 +5148,10 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
51485148
break;
51495149
}
51505150

5151-
real_len = ptr - data;
5152-
5153-
/* Adjust for actual length */
5154-
if (len != real_len) {
5155-
bt_dev_err_ratelimited(hdev, "advertising data len corrected");
5156-
len = real_len;
5157-
}
5151+
/* Adjust for actual length. This handles the case when remote
5152+
* device is advertising with incorrect data length.
5153+
*/
5154+
len = ptr - data;
51585155

51595156
/* If the direct address is present, then this report is from
51605157
* a LE Direct Advertising Report event. In that case it is

0 commit comments

Comments
 (0)