Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291072
b: refs/heads/master
c: 02b7cc6
h: refs/heads/master
v: v3
  • Loading branch information
Johan Hedberg committed Feb 28, 2012
1 parent 3645cf7 commit 74a04a2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc2c04ec1ea8bd5137c99dc88bc04b4a07a11443
refs/heads/master: 02b7cc62b6176748dc5b55e0ca9c965f73a5c300
6 changes: 3 additions & 3 deletions trunk/net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -2869,9 +2869,9 @@ static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_b

ie = hci_inquiry_cache_lookup(hdev, &conn->dst);
if (ie)
ie->data.ssp_mode = (ev->features[0] & 0x01);
ie->data.ssp_mode = (ev->features[0] & LMP_HOST_SSP);

if (ev->features[0] & 0x01)
if (ev->features[0] & LMP_HOST_SSP)
set_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
}

Expand Down Expand Up @@ -3224,7 +3224,7 @@ static inline void hci_remote_host_features_evt(struct hci_dev *hdev, struct sk_

ie = hci_inquiry_cache_lookup(hdev, &ev->bdaddr);
if (ie)
ie->data.ssp_mode = (ev->features[0] & 0x01);
ie->data.ssp_mode = (ev->features[0] & LMP_HOST_SSP);

hci_dev_unlock(hdev);
}
Expand Down

0 comments on commit 74a04a2

Please sign in to comment.