diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-10-05 09:56:56 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-10-07 18:21:51 -0400 |
commit | a0c234fe8972aa6a5afe2db6c27a3f5d5fbd88e7 (patch) | |
tree | a47cdeec7101d6b06537174b3d41358a572ebd1f /net/bluetooth/amp.c | |
parent | fa4ebc66c432d0e0ec947cb754d4144c4a681f28 (diff) |
Bluetooth: AMP: Factor out phylink_add
Add direction parameter to phylink_add since it is anyway set later.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/amp.c')
-rw-r--r-- | net/bluetooth/amp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c index 2fc5562a84b9..59da0f15818e 100644 --- a/net/bluetooth/amp.c +++ b/net/bluetooth/amp.c | |||
@@ -108,7 +108,7 @@ static u8 __next_handle(struct amp_mgr *mgr) | |||
108 | } | 108 | } |
109 | 109 | ||
110 | struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr, | 110 | struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr, |
111 | u8 remote_id) | 111 | u8 remote_id, bool out) |
112 | { | 112 | { |
113 | bdaddr_t *dst = mgr->l2cap_conn->dst; | 113 | bdaddr_t *dst = mgr->l2cap_conn->dst; |
114 | struct hci_conn *hcon; | 114 | struct hci_conn *hcon; |
@@ -117,12 +117,14 @@ struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr, | |||
117 | if (!hcon) | 117 | if (!hcon) |
118 | return NULL; | 118 | return NULL; |
119 | 119 | ||
120 | BT_DBG("hcon %p dst %pMR", hcon, dst); | ||
121 | |||
120 | hcon->state = BT_CONNECT; | 122 | hcon->state = BT_CONNECT; |
121 | hcon->out = true; | ||
122 | hcon->attempt++; | 123 | hcon->attempt++; |
123 | hcon->handle = __next_handle(mgr); | 124 | hcon->handle = __next_handle(mgr); |
124 | hcon->remote_id = remote_id; | 125 | hcon->remote_id = remote_id; |
125 | hcon->amp_mgr = mgr; | 126 | hcon->amp_mgr = mgr; |
127 | hcon->out = out; | ||
126 | 128 | ||
127 | return hcon; | 129 | return hcon; |
128 | } | 130 | } |