From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 9 Oct 2015 14:13:49 +0000 (+0200)
Subject: Bluetooth: Remove quirk for HCI_VENDOR_PKT filter handling
X-Git-Tag: KARO-TX6UL-2015-11-03~89^2~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8cd4f581427213e086fca601bb9d8c7ea9cfeabc;p=karo-tx-linux.git

Bluetooth: Remove quirk for HCI_VENDOR_PKT filter handling

The HCI_VENDOR_PKT quirk was needed for BPA-100/105 devices that send
these messages. Now that there is support for proper diagnostic channel
this quirk is no longer needed.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 9a100c1fd7b5..bad86dfe134f 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -120,10 +120,7 @@ static bool is_filtered_packet(struct sock *sk, struct sk_buff *skb)
 	/* Apply filter */
 	flt = &hci_pi(sk)->filter;
 
-	if (bt_cb(skb)->pkt_type == HCI_VENDOR_PKT)
-		flt_type = 0;
-	else
-		flt_type = bt_cb(skb)->pkt_type & HCI_FLT_TYPE_BITS;
+	flt_type = bt_cb(skb)->pkt_type & HCI_FLT_TYPE_BITS;
 
 	if (!test_bit(flt_type, &flt->type_mask))
 		return true;