diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-02-24 07:52:18 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-02-24 14:10:36 -0500 |
commit | 12d4a3b2ccb3ac2bd56e7c216d6e7f44730006f3 (patch) | |
tree | 432f3b547d28cf36591b817deaaacd6cecae2618 /net/bluetooth/mgmt.c | |
parent | 778b235a3be0588da1909f7ef75b4bc3dbc09dfc (diff) |
Bluetooth: Move check for MGMT_CONNECTED flag into mgmt.c
Once mgmt_set_powered(off) starts doing disconnections we'll need to
care about any disconnections in mgmt.c and not just those with the
MGMT_CONNECTED flag set. Therefore, move the check into mgmt.c from
hci_event.c.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d39e57e9fed6..bdc831b3bb97 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -5012,11 +5012,15 @@ static void unpair_device_rsp(struct pending_cmd *cmd, void *data) | |||
5012 | } | 5012 | } |
5013 | 5013 | ||
5014 | void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, | 5014 | void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, |
5015 | u8 link_type, u8 addr_type, u8 reason) | 5015 | u8 link_type, u8 addr_type, u8 reason, |
5016 | bool mgmt_connected) | ||
5016 | { | 5017 | { |
5017 | struct mgmt_ev_device_disconnected ev; | 5018 | struct mgmt_ev_device_disconnected ev; |
5018 | struct sock *sk = NULL; | 5019 | struct sock *sk = NULL; |
5019 | 5020 | ||
5021 | if (!mgmt_connected) | ||
5022 | return; | ||
5023 | |||
5020 | if (link_type != ACL_LINK && link_type != LE_LINK) | 5024 | if (link_type != ACL_LINK && link_type != LE_LINK) |
5021 | return; | 5025 | return; |
5022 | 5026 | ||