diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-20 16:53:46 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-20 17:32:16 -0500 |
commit | 1e16357480fdeaeff7c5572f1afba7835473fcb6 (patch) | |
tree | 54cd197f10c935a3853298dadfa72ef0714363a4 | |
parent | 6d80dfd094a7b286e95cdcac79efeb7bbb4e226f (diff) |
Bluetooth: mgmt: Fix Set SSP check for supported feature
If the local controller doesn't support SSP we should always return an
error for the Set SSP command.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index edf84c3e6a2b..aa0d64040fac 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -1065,6 +1065,12 @@ static int set_ssp(struct sock *sk, u16 index, void *data, u16 len) | |||
1065 | goto failed; | 1065 | goto failed; |
1066 | } | 1066 | } |
1067 | 1067 | ||
1068 | if (!(hdev->features[6] & LMP_SIMPLE_PAIR)) { | ||
1069 | err = cmd_status(sk, index, MGMT_OP_SET_SSP, | ||
1070 | MGMT_STATUS_NOT_SUPPORTED); | ||
1071 | goto failed; | ||
1072 | } | ||
1073 | |||
1068 | if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) { | 1074 | if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) { |
1069 | err = cmd_status(sk, index, MGMT_OP_SET_SSP, MGMT_STATUS_BUSY); | 1075 | err = cmd_status(sk, index, MGMT_OP_SET_SSP, MGMT_STATUS_BUSY); |
1070 | goto failed; | 1076 | goto failed; |