summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-03-17 13:48:49 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-03-17 18:03:08 +0100
commit88b94ce925cb103851f39bfa7e23e09823573d30 (patch)
treec73d6a6d81e9177a8353a821c4eeb8891f11879c /net/bluetooth
parenta380b6cff1a2d2139772e88219d08330f84d0381 (diff)
downloadop-kernel-dev-88b94ce925cb103851f39bfa7e23e09823573d30.zip
op-kernel-dev-88b94ce925cb103851f39bfa7e23e09823573d30.tar.gz
Bluetooth: Add hdev_init callback for HCI channels
In order to make the mgmt command handling more generic we can't have a direct call to mgmt_init_hdev() from mgmt_control(). This patch adds a new callback to struct hci_mgmt_chan. And sets it to point to the mgmt_init_hdev() function for the HCI_CHANNEL_CONTROL instance. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 915a2a1..ac897e6 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -6493,8 +6493,8 @@ int mgmt_control(struct hci_mgmt_chan *chan, struct sock *sk,
goto done;
}
- if (hdev)
- mgmt_init_hdev(sk, hdev);
+ if (hdev && chan->hdev_init)
+ chan->hdev_init(sk, hdev);
cp = buf + sizeof(*hdr);
@@ -7706,6 +7706,7 @@ static struct hci_mgmt_chan chan = {
.channel = HCI_CHANNEL_CONTROL,
.handler_count = ARRAY_SIZE(mgmt_handlers),
.handlers = mgmt_handlers,
+ .hdev_init = mgmt_init_hdev,
};
int mgmt_init(void)
OpenPOWER on IntegriCloud