aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-05 14:47:45 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-06 04:24:30 -0400
commit536619e86d9398a20063f7c3d15deb9dcc234097 (patch)
tree7219061b5b6b063f0e3e0be389c696ea74732e5e /net/bluetooth
parent6ed971ca4f6bd96e26b3166cb5a94f7f8158fe77 (diff)
Bluetooth: Rename AMP status constants and use them
The AMP controller status constants need to be actually used to avoid crypted hardcoded numbers. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/a2mp.c2
-rw-r--r--net/bluetooth/hci_core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 6d62d3140cf8..6dfef731825f 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -79,7 +79,7 @@ static inline void __a2mp_cl_bredr(struct a2mp_cl *cl)
79{ 79{
80 cl->id = AMP_ID_BREDR; 80 cl->id = AMP_ID_BREDR;
81 cl->type = AMP_TYPE_BREDR; 81 cl->type = AMP_TYPE_BREDR;
82 cl->status = 1; 82 cl->status = AMP_STATUS_BLUETOOTH_ONLY;
83} 83}
84 84
85/* hci_dev_list shall be locked */ 85/* hci_dev_list shall be locked */
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index aa63ebb114d4..0d5fe0843f5e 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1381,7 +1381,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
1381 } 1381 }
1382 1382
1383 /* Controller radio is available but is currently powered down */ 1383 /* Controller radio is available but is currently powered down */
1384 hdev->amp_status = 0; 1384 hdev->amp_status = AMP_STATUS_POWERED_DOWN;
1385 1385
1386 memset(hdev->eir, 0, sizeof(hdev->eir)); 1386 memset(hdev->eir, 0, sizeof(hdev->eir));
1387 memset(hdev->dev_class, 0, sizeof(hdev->dev_class)); 1387 memset(hdev->dev_class, 0, sizeof(hdev->dev_class));