lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Remove check for number of AMP controller

Browse Source 
The number of controllers for the AMP discover response has already
been calculated. And since the hci_dev_list lock is held, it can not
change. So there is no need for any extra checks.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann
2013-10-05 11:47:47 -07:00
committed by Johan Hedberg
parent 346e7099c2
commit 23f0cb41a2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/bluetooth/a2mp.c
View File

@@ -76,7 +76,7 @@ u8 __next_ident(struct amp_mgr *mgr)
} }
/* hci_dev_list shall be locked */ /* hci_dev_list shall be locked */
static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl, u8 num_ctrl) static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl)
{ {
int i = 0; int i = 0;
struct hci_dev *hdev; struct hci_dev *hdev;
@@ -91,8 +91,7 @@ static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl, u8 num_ctrl)
continue; continue;
/* Starting from second entry */ /* Starting from second entry */
if (++i >= num_ctrl) ++i;
return;
cl[i].id = hdev->id; cl[i].id = hdev->id;
cl[i].type = hdev->amp_type; cl[i].type = hdev->amp_type;
@@ -166,7 +165,7 @@ static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb,
rsp->mtu = __constant_cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU); rsp->mtu = __constant_cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
rsp->ext_feat = 0; rsp->ext_feat = 0;
__a2mp_add_cl(mgr, rsp->cl, num_ctrl); __a2mp_add_cl(mgr, rsp->cl);
read_unlock(&hci_dev_list_lock); read_unlock(&hci_dev_list_lock);