diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-01-25 07:21:06 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 10:01:29 -0500 |
commit | 84bde9d6c0e6830f4a8685a5d237965053118bf9 (patch) | |
tree | bb6bce4d3477ebee0a4027e30103201fbbd74ea8 /net/bluetooth/mgmt.c | |
parent | 58a681ef1455aef9caad1d41073868fb399373f6 (diff) |
Bluetooth: Convert hdev->ssp_mode to a flag
The ssp_mode is essentially just a boolean so it's more appropriate to
have it simply as a flag in hdev->dev_flags.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index ae9283d47e65..89707996d352 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -297,7 +297,7 @@ static u32 get_current_settings(struct hci_dev *hdev) | |||
297 | if (test_bit(HCI_AUTH, &hdev->flags)) | 297 | if (test_bit(HCI_AUTH, &hdev->flags)) |
298 | settings |= MGMT_SETTING_LINK_SECURITY; | 298 | settings |= MGMT_SETTING_LINK_SECURITY; |
299 | 299 | ||
300 | if (hdev->ssp_mode > 0) | 300 | if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) |
301 | settings |= MGMT_SETTING_SSP; | 301 | settings |= MGMT_SETTING_SSP; |
302 | 302 | ||
303 | return settings; | 303 | return settings; |
@@ -416,7 +416,7 @@ static int update_eir(struct hci_dev *hdev) | |||
416 | if (!(hdev->features[6] & LMP_EXT_INQ)) | 416 | if (!(hdev->features[6] & LMP_EXT_INQ)) |
417 | return 0; | 417 | return 0; |
418 | 418 | ||
419 | if (hdev->ssp_mode == 0) | 419 | if (!test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) |
420 | return 0; | 420 | return 0; |
421 | 421 | ||
422 | if (test_bit(HCI_SERVICE_CACHE, &hdev->dev_flags)) | 422 | if (test_bit(HCI_SERVICE_CACHE, &hdev->dev_flags)) |