renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-13 15:53:56 +08:00
Code

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Browse Source
This commit is contained in:
John W. Linville 2013-02-04 16:40:07 -05:00
commit 4c52d3d3fd
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bluetooth/hci_conn.c
View File

@ -249,12 +249,12 @@ static void hci_conn_disconnect(struct hci_conn *conn)
__u8 reason = hci_proto_disconn_ind(conn); __u8 reason = hci_proto_disconn_ind(conn);
switch (conn->type) { switch (conn->type) {
case ACL_LINK:
hci_acl_disconn(conn, reason);
break;
case AMP_LINK: case AMP_LINK:
hci_amp_disconn(conn, reason); hci_amp_disconn(conn, reason);
break; break;
default:
hci_acl_disconn(conn, reason);
break;
} }
} }

13
net/bluetooth/smp.c
View File

@ -859,6 +859,19 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb)
skb_pull(skb, sizeof(code)); skb_pull(skb, sizeof(code));
/*
* The SMP context must be initialized for all other PDUs except
* pairing and security requests. If we get any other PDU when
* not initialized simply disconnect (done if this function
* returns an error).
*/
if (code != SMP_CMD_PAIRING_REQ && code != SMP_CMD_SECURITY_REQ &&
!conn->smp_chan) {
BT_ERR("Unexpected SMP command 0x%02x. Disconnecting.", code);
kfree_skb(skb);
return -ENOTSUPP;
}
switch (code) { switch (code) {
case SMP_CMD_PAIRING_REQ: case SMP_CMD_PAIRING_REQ:
reason = smp_cmd_pairing_req(conn, skb); reason = smp_cmd_pairing_req(conn, skb);