diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
| commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
| tree | 4c3924d35d99d413a95205ac21da8d369063234b /net/bluetooth/mgmt.c | |
| parent | 3b09c84cb622ffbcdb5d541986b1eaf7d5812602 (diff) | |
| parent | 1140afa862842ac3e56678693050760edc4ecde9 (diff) | |
| download | op-kernel-dev-9ee6045f09a7875ebe55b9942b232a19076b157b.zip op-kernel-dev-9ee6045f09a7875ebe55b9942b232a19076b157b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 2540944..bc8e59d 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -291,7 +291,7 @@ static u32 get_current_settings(struct hci_dev *hdev) if (!(hdev->features[4] & LMP_NO_BREDR)) settings |= MGMT_SETTING_BREDR; - if (hdev->extfeatures[0] & LMP_HOST_LE) + if (hdev->host_features[0] & LMP_HOST_LE) settings |= MGMT_SETTING_LE; if (test_bit(HCI_AUTH, &hdev->flags)) @@ -2756,7 +2756,7 @@ int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status) if (!cmd) return -ENOENT; - err = cmd_status(cmd->sk, hdev->id, cmd->opcode, status); + err = cmd_status(cmd->sk, hdev->id, cmd->opcode, mgmt_status(status)); mgmt_pending_remove(cmd); return err; |
