aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-01-09 16:04:30 +0530
committerTushar Behera <tushar.behera@linaro.org>2013-01-09 16:04:30 +0530
commitfea21bc9f7ac72642d3c2e7a972cab0a5d1bf73f (patch)
tree222c0e6816a2351dbd3f184e547bedf05709b574
parent094bc1f7736f46ca2abdc26a76729e7a56d1532c (diff)
Add deleted code during 3.8 linaro-android mergesamsung-lt-v3.8-prelim-temp
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rwxr-xr-xnet/bluetooth/hci_event.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 4b9f55837f0..8e57b29dbd1 100755
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2047,6 +2047,15 @@ unlock:
hci_conn_check_pending(hdev);
}
+static inline bool is_sco_active(struct hci_dev *hdev)
+{
+ if (hci_conn_hash_lookup_state(hdev, SCO_LINK, BT_CONNECTED) ||
+ (hci_conn_hash_lookup_state(hdev, ESCO_LINK,
+ BT_CONNECTED)))
+ return true;
+ return false;
+}
+
void hci_conn_accept(struct hci_conn *conn, int mask)
{
struct hci_dev *hdev = conn->hdev;