aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bluetooth/hci_core.c6
-rw-r--r--net/bluetooth/hci_event.c2
-rw-r--r--net/bluetooth/hci_sock.c2
-rw-r--r--net/bluetooth/l2cap_core.c2
-rw-r--r--net/bluetooth/smp.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cb05d7f16a34..ddf33900f7f3 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -4477,7 +4477,7 @@ int hci_req_run(struct hci_request *req, hci_req_complete_t complete)
4477 4477
4478 BT_DBG("length %u", skb_queue_len(&req->cmd_q)); 4478 BT_DBG("length %u", skb_queue_len(&req->cmd_q));
4479 4479
4480 /* If an error occured during request building, remove all HCI 4480 /* If an error occurred during request building, remove all HCI
4481 * commands queued on the HCI request queue. 4481 * commands queued on the HCI request queue.
4482 */ 4482 */
4483 if (req->err) { 4483 if (req->err) {
@@ -4546,7 +4546,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen,
4546 return -ENOMEM; 4546 return -ENOMEM;
4547 } 4547 }
4548 4548
4549 /* Stand-alone HCI commands must be flaged as 4549 /* Stand-alone HCI commands must be flagged as
4550 * single-command requests. 4550 * single-command requests.
4551 */ 4551 */
4552 bt_cb(skb)->req.start = true; 4552 bt_cb(skb)->req.start = true;
@@ -4566,7 +4566,7 @@ void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,
4566 4566
4567 BT_DBG("%s opcode 0x%4.4x plen %d", hdev->name, opcode, plen); 4567 BT_DBG("%s opcode 0x%4.4x plen %d", hdev->name, opcode, plen);
4568 4568
4569 /* If an error occured during request building, there is no point in 4569 /* If an error occurred during request building, there is no point in
4570 * queueing the HCI command. We can simply return. 4570 * queueing the HCI command. We can simply return.
4571 */ 4571 */
4572 if (req->err) 4572 if (req->err)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 96291530606d..f5704bae67a2 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1045,7 +1045,7 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb)
1045 1045
1046 hci_dev_lock(hdev); 1046 hci_dev_lock(hdev);
1047 1047
1048 /* If we're doing connection initation as peripheral. Set a 1048 /* If we're doing connection initiation as peripheral. Set a
1049 * timeout in case something goes wrong. 1049 * timeout in case something goes wrong.
1050 */ 1050 */
1051 if (*sent) { 1051 if (*sent) {
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 115f149362ba..bbc4ac748263 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -987,7 +987,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
987 skb_queue_tail(&hdev->raw_q, skb); 987 skb_queue_tail(&hdev->raw_q, skb);
988 queue_work(hdev->workqueue, &hdev->tx_work); 988 queue_work(hdev->workqueue, &hdev->tx_work);
989 } else { 989 } else {
990 /* Stand-alone HCI commands must be flaged as 990 /* Stand-alone HCI commands must be flagged as
991 * single-command requests. 991 * single-command requests.
992 */ 992 */
993 bt_cb(skb)->req.start = true; 993 bt_cb(skb)->req.start = true;
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d46c5127f6c3..fc15174c612c 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4082,7 +4082,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
4082 chan->num_conf_req++; 4082 chan->num_conf_req++;
4083 } 4083 }
4084 4084
4085 /* Got Conf Rsp PENDING from remote side and asume we sent 4085 /* Got Conf Rsp PENDING from remote side and assume we sent
4086 Conf Rsp PENDING in the code above */ 4086 Conf Rsp PENDING in the code above */
4087 if (test_bit(CONF_REM_CONF_PEND, &chan->conf_state) && 4087 if (test_bit(CONF_REM_CONF_PEND, &chan->conf_state) &&
4088 test_bit(CONF_LOC_CONF_PEND, &chan->conf_state)) { 4088 test_bit(CONF_LOC_CONF_PEND, &chan->conf_state)) {
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index fea3782989f4..3ebf65b50881 100644
--- 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)
964 if (sec_level > conn->hcon->pending_sec_level) 964 if (sec_level > conn->hcon->pending_sec_level)
965 conn->hcon->pending_sec_level = sec_level; 965 conn->hcon->pending_sec_level = sec_level;
966 966
967 /* If we need MITM check that it can be acheived */ 967 /* If we need MITM check that it can be achieved */
968 if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) { 968 if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {
969 u8 method; 969 u8 method;
970 970
@@ -1022,7 +1022,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
1022 1022
1023 auth = rsp->auth_req & AUTH_REQ_MASK; 1023 auth = rsp->auth_req & AUTH_REQ_MASK;
1024 1024
1025 /* If we need MITM check that it can be acheived */ 1025 /* If we need MITM check that it can be achieved */
1026 if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) { 1026 if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {
1027 u8 method; 1027 u8 method;
1028 1028