commit ffab1579f14bfaf7e838a11a34394f34db4c89bb
author Petri Gynther <pgynther@google.com> Tue Mar 03 00:50:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 03 00:50:51 2015 +0000
tree 7c2d7a88e16ec1a8cf7eaa59bb9d9d8b76db2e0f
parent 84adfb4ba8b522a6e333ebc9ad2fe7d278e54a67
parent a1460b68a961ba5b27021f98fbb45f40cd48a11b

Merge "GFRM200: Drop ADV_IND undirected advertisements" into newkernel_dev

net/bluetooth/hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 3f2e8b8..392abb1 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4623,11 +4623,26 @@
 		struct hci_ev_le_advertising_info *ev = ptr;
 		s8 rssi;
 
+		/*
+		 * GFRM200: Drop Connectable undirected - ADV_IND (0x00)
+		 * Data length: 16
+		 * Appearance: Human Interface Device (0x03c0)
+		 */
+		if (ev->evt_type == LE_ADV_IND && ev->length == 16 &&
+		    ev->data[6] == 0x3 && ev->data[5] == 0xC0) {
+			print_hex_dump(KERN_INFO,
+					"bluez: Drop GFRM200 ADV_IND: ",
+					DUMP_PREFIX_NONE, 16, 1, ev->data,
+					ev->length, true);
+			goto next;
+		}
+
 		rssi = ev->data[ev->length];
 		process_adv_report(hdev, ev->evt_type, &ev->bdaddr,
 				   ev->bdaddr_type, NULL, 0, rssi,
 				   ev->data, ev->length);
 
+	next:
 		ptr += sizeof(*ev) + ev->length + 1;
 	}