Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / bluetooth / smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 9821dc9..3ebf65b 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -964,7 +964,7 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
        if (sec_level > conn->hcon->pending_sec_level)
                conn->hcon->pending_sec_level = sec_level;
 
-       /* If we need MITM check that it can be acheived */
+       /* If we need MITM check that it can be achieved */
        if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {
                u8 method;
 
@@ -1022,7 +1022,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
 
        auth = rsp->auth_req & AUTH_REQ_MASK;
 
-       /* If we need MITM check that it can be acheived */
+       /* If we need MITM check that it can be achieved */
        if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {
                u8 method;
 
@@ -1743,36 +1743,3 @@ void smp_unregister(struct hci_dev *hdev)
        hdev->smp_data = NULL;
        l2cap_chan_put(chan);
 }
-
-#ifdef CONFIG_BT_SELFTEST
-
-static int __init run_selftests(struct crypto_blkcipher *tfm_aes)
-{
-       return 0;
-}
-
-static int __init test_smp(void)
-{
-       struct crypto_blkcipher *tfm_aes;
-       int err;
-
-       tfm_aes = crypto_alloc_blkcipher("ecb(aes)", 0, CRYPTO_ALG_ASYNC);
-       if (IS_ERR(tfm_aes)) {
-               BT_ERR("Unable to create ECB crypto context");
-               return PTR_ERR(tfm_aes);
-       }
-
-       err = run_selftests(tfm_aes);
-       if (err < 0)
-               BT_ERR("Self tests failed");
-       else
-               BT_INFO("Self-tests passed");
-
-       crypto_free_blkcipher(tfm_aes);
-
-       return err;
-}
-
-module_init(test_smp);
-
-#endif /* CONFIG_BT_SELFTEST */