diff options
author | John W. Linville | 2012-04-27 21:16:43 +0200 |
---|---|---|
committer | John W. Linville | 2012-04-27 21:16:43 +0200 |
commit | 4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f (patch) | |
tree | 587ffa9493e4b6af014f9acb2c09177c2c54af3b /net/bluetooth/hci_event.c | |
parent | mac80211: call ieee80211_mgd_stop() on interface stop (diff) | |
parent | Add Foxconn / Hon Hai IDs for btusb module (diff) | |
download | kernel-qcow2-linux-4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f.tar.gz kernel-qcow2-linux-4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f.tar.xz kernel-qcow2-linux-4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f.zip |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index b37531094c49..6c065254afc0 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1901,6 +1901,8 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff } if (ev->status == 0) { + if (conn->type == ACL_LINK && conn->flush_key) + hci_remove_link_key(hdev, &conn->dst); hci_proto_disconn_cfm(conn, ev->reason); hci_conn_del(conn); } @@ -2311,6 +2313,7 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk case HCI_OP_USER_PASSKEY_NEG_REPLY: hci_cc_user_passkey_neg_reply(hdev, skb); + break; case HCI_OP_LE_SET_SCAN_PARAM: hci_cc_le_set_scan_param(hdev, skb); |