leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Convert hdev->ssp_mode to a flag

Browse Source 
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>
This commit is contained in:
Johan Hedberg
2012-01-25 14:21:06 +02:00
parent 58a681ef14
commit 84bde9d6c0
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/bluetooth/hci.h
View File

@@ -94,6 +94,7 @@ enum {
HCI_DEBUG_KEYS, HCI_DEBUG_KEYS,
HCI_LE_SCAN, HCI_LE_SCAN,
HCI_SSP_ENABLED,
}; };
/* HCI ioctl defines */ /* HCI ioctl defines */

1
include/net/bluetooth/hci_core.h
View File

@@ -144,7 +144,6 @@ struct hci_dev {
__u8 features[8]; __u8 features[8];
__u8 host_features[8]; __u8 host_features[8];
__u8 commands[64]; __u8 commands[64];
__u8 ssp_mode;
__u8 hci_ver; __u8 hci_ver;
__u16 hci_rev; __u16 hci_rev;
__u8 lmp_ver; __u8 lmp_ver;

6
net/bluetooth/hci_conn.c
View File

@@ -609,8 +609,8 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
if (test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) && if (test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) &&
conn->hdev->ssp_mode > 0 && test_bit(HCI_SSP_ENABLED, &conn->hdev->dev_flags) &&
!(conn->link_mode & HCI_LM_ENCRYPT)) !(conn->link_mode & HCI_LM_ENCRYPT))
return 0; return 0;
return 1; return 1;
@@ -674,7 +674,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
key. */ key. */
if (sec_level == BT_SECURITY_LOW && if (sec_level == BT_SECURITY_LOW &&
(!test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) || (!test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) ||
!conn->hdev->ssp_mode)) !test_bit(HCI_SSP_ENABLED, &conn->hdev->dev_flags)))
return 1; return 1;
/* For other security levels we need the link key. */ /* For other security levels we need the link key. */

17
net/bluetooth/hci_event.c
View File

@@ -429,7 +429,10 @@ static void hci_cc_read_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
if (rp->status) if (rp->status)
return; return;
hdev->ssp_mode = rp->mode; if (rp->mode)
set_bit(HCI_SSP_ENABLED, &hdev->dev_flags);
else
clear_bit(HCI_SSP_ENABLED, &hdev->dev_flags);
} }
static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb) static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
@@ -446,7 +449,10 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
if (!sent) if (!sent)
return; return;
hdev->ssp_mode = *((__u8 *) sent); if (*((u8 *) sent))
set_bit(HCI_SSP_ENABLED, &hdev->dev_flags);
else
clear_bit(HCI_SSP_ENABLED, &hdev->dev_flags);
} }
static u8 hci_get_inquiry_mode(struct hci_dev *hdev) static u8 hci_get_inquiry_mode(struct hci_dev *hdev)
@@ -1264,7 +1270,7 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
/* Only request authentication for SSP connections or non-SSP /* Only request authentication for SSP connections or non-SSP
* devices with sec_level HIGH or if MITM protection is requested */ * devices with sec_level HIGH or if MITM protection is requested */
if (!(hdev->ssp_mode > 0 && if (!(test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
test_bit(HCI_CONN_SSP_ENABLED, &conn->flags)) && test_bit(HCI_CONN_SSP_ENABLED, &conn->flags)) &&
conn->pending_sec_level != BT_SECURITY_HIGH && conn->pending_sec_level != BT_SECURITY_HIGH &&
!(conn->auth_type & 0x01)) !(conn->auth_type & 0x01))
@@ -1840,7 +1846,7 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
if (!ev->status) { if (!ev->status) {
if (!(test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) && if (!(test_bit(HCI_CONN_SSP_ENABLED, &conn->flags) &&
hdev->ssp_mode > 0) && test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) &&
test_bit(HCI_CONN_REAUTH_PEND, &conn->flags)) { test_bit(HCI_CONN_REAUTH_PEND, &conn->flags)) {
BT_INFO("re-auth of legacy device is not possible."); BT_INFO("re-auth of legacy device is not possible.");
} else { } else {
@@ -1855,7 +1861,8 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
clear_bit(HCI_CONN_REAUTH_PEND, &conn->flags); clear_bit(HCI_CONN_REAUTH_PEND, &conn->flags);
if (conn->state == BT_CONFIG) { if (conn->state == BT_CONFIG) {
if (!ev->status && hdev->ssp_mode > 0 && if (!ev->status &&
test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
test_bit(HCI_CONN_SSP_ENABLED, &conn->flags)) { test_bit(HCI_CONN_SSP_ENABLED, &conn->flags)) {
struct hci_cp_set_conn_encrypt cp; struct hci_cp_set_conn_encrypt cp;
cp.handle = ev->handle; cp.handle = ev->handle;

4
net/bluetooth/mgmt.c
View File

@@ -297,7 +297,7 @@ static u32 get_current_settings(struct hci_dev *hdev)
if (test_bit(HCI_AUTH, &hdev->flags)) if (test_bit(HCI_AUTH, &hdev->flags))
settings |= MGMT_SETTING_LINK_SECURITY; settings |= MGMT_SETTING_LINK_SECURITY;
if (hdev->ssp_mode > 0) if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags))
settings |= MGMT_SETTING_SSP; settings |= MGMT_SETTING_SSP;
return settings; return settings;
@@ -416,7 +416,7 @@ static int update_eir(struct hci_dev *hdev)
if (!(hdev->features[6] & LMP_EXT_INQ)) if (!(hdev->features[6] & LMP_EXT_INQ))
return 0; return 0;
if (hdev->ssp_mode == 0) if (!test_bit(HCI_SSP_ENABLED, &hdev->dev_flags))
return 0; return 0;
if (test_bit(HCI_SERVICE_CACHE, &hdev->dev_flags)) if (test_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))