aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-09 09:07:29 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:37 -0500
commitbab73cb68435232ba78a4bd1ac1a85862e3be0bb (patch)
treebefa66506373f8e5d3a3cec6f48eea5d5bee892e /net/bluetooth/hci_event.c
parent88c1fe4ba55c7245ad2f3c81689f854287875121 (diff)
Bluetooth: Add address type to mgmt_ev_auth_failed
This patch updates the Authentication Failed mgmt event to match the latest API specification by adding an address type to it. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 3bf3f4d59bcc..b0784ee5f8b9 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1901,7 +1901,8 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
1901 conn->sec_level = conn->pending_sec_level; 1901 conn->sec_level = conn->pending_sec_level;
1902 } 1902 }
1903 } else { 1903 } else {
1904 mgmt_auth_failed(hdev, &conn->dst, ev->status); 1904 mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
1905 ev->status);
1905 } 1906 }
1906 1907
1907 clear_bit(HCI_CONN_AUTH_PEND, &conn->flags); 1908 clear_bit(HCI_CONN_AUTH_PEND, &conn->flags);
@@ -3166,7 +3167,8 @@ static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, struct sk_
3166 * event gets always produced as initiator and is also mapped to 3167 * event gets always produced as initiator and is also mapped to
3167 * the mgmt_auth_failed event */ 3168 * the mgmt_auth_failed event */
3168 if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status != 0) 3169 if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status != 0)
3169 mgmt_auth_failed(hdev, &conn->dst, ev->status); 3170 mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
3171 ev->status);
3170 3172
3171 hci_conn_put(conn); 3173 hci_conn_put(conn);
3172 3174