From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 5 Oct 2013 20:57:53 +0000 (-0700)
Subject: Bluetooth: Check for non BR/EDR controller in AMP discover response
X-Git-Tag: firefly_0821_release~176^2~4570^2~3^2^2~364^2~123
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a646bd81945b337b1cf37dea4734847947a0d9ad;p=firefly-linux-kernel-4.4.55.git

Bluetooth: Check for non BR/EDR controller in AMP discover response

Within the AMP discover response, all controllers that are not the
primary BR/EDR controller are valid.

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

diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 529789d81159..ad8bda3a6fd1 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -210,7 +210,7 @@ static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
 		BT_DBG("Remote AMP id %d type %d status %d", cl->id, cl->type,
 		       cl->status);
 
-		if (cl->id != AMP_ID_BREDR && cl->type == HCI_AMP) {
+		if (cl->id != AMP_ID_BREDR && cl->type != AMP_TYPE_BREDR) {
 			struct a2mp_info_req req;
 
 			found = true;