---

yaml --- r: 290997 b: refs/heads/master c: 1e16357 h: refs/heads/master i: 290995: 4dd78f8 v: v3
git-mirror · Feb 20, 2012 · 2a1b3c0 · 2a1b3c0
1 parent 2095fa0
commit 2a1b3c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d80dfd094a7b286e95cdcac79efeb7bbb4e226f
+refs/heads/master: 1e16357480fdeaeff7c5572f1afba7835473fcb6
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
@@ -1065,6 +1065,12 @@ static int set_ssp(struct sock *sk, u16 index, void *data, u16 len)
 		goto failed;
 	}
 
+	if (!(hdev->features[6] & LMP_SIMPLE_PAIR)) {
+		err = cmd_status(sk, index, MGMT_OP_SET_SSP,
+						MGMT_STATUS_NOT_SUPPORTED);
+		goto failed;
+	}
+
 	if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) {
 		err = cmd_status(sk, index, MGMT_OP_SET_SSP, MGMT_STATUS_BUSY);
 		goto failed;