Return-Path: MIME-Version: 1.0 In-Reply-To: References: <1401600034-16687-1-git-send-email-kiran.kumar@linaro.org> Date: Mon, 23 Jun 2014 14:05:02 +0530 Message-ID: Subject: Re: [RFC v3] Bluetooth: Keep master role when SCO or eSCO is active From: Kiran Raparthy To: LKML Cc: "hyungseoung.yoo" , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , "David S. Miller" , "open list:BLUETOOTH SUBSYSTEM" , "open list:NETWORKING [GENERAL]" , Android Kernel Team , John Stultz , Jaikumar Ganesh , Kiran Raparthy Content-Type: multipart/alternative; boundary=047d7bdc8ac427723204fc7cb8ef List-ID: --047d7bdc8ac427723204fc7cb8ef Content-Type: text/plain; charset=UTF-8 Gentle reminder. Regards, Kiran On 9 June 2014 11:38, Kiran Raparthy wrote: > Just a reminder. > Regards, > Kiran > > > On 1 June 2014 10:50, Kiran Kumar Raparthy wrote: > >> From: "hyungseoung.yoo" >> >> Preserve the master role when SCO or eSCO is active >> as this improves compatability with lots of >> headset and chipset combinations. >> >> This is one of the number of patches from the Android AOSP >> common.git tree, which is used on almost all Android devices. >> It looks like it would improve support for compatibility with >> lot of headset,so I wanted to submit it for review to see >> if it should go upstream. >> >> v3: Fixed formatting issues pointed by Sergei >> >> Cc: Marcel Holtmann >> Cc: Gustavo Padovan >> Cc: Johan Hedberg >> Cc: "David S. Miller" >> Cc: linux-bluetooth@vger.kernel.org >> Cc: netdev@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Cc: Android Kernel Team >> Cc: John Stultz >> Signed-off-by: hyungseoung.yoo >> Signed-off-by: Jaikumar Ganesh >> [kiran: Added context to commit message] >> Signed-off-by: Kiran Raparthy >> --- >> net/bluetooth/hci_event.c | 12 +++++++++++- >> 1 file changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c >> index 15010a2..cfb1355 100644 >> --- a/net/bluetooth/hci_event.c >> +++ b/net/bluetooth/hci_event.c >> @@ -1915,6 +1915,14 @@ 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; >> +} >> + >> static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff >> *skb) >> { >> struct hci_ev_conn_request *ev = (void *) skb->data; >> @@ -1961,7 +1969,9 @@ static void hci_conn_request_evt(struct hci_dev >> *hdev, struct sk_buff *skb) >> >> bacpy(&cp.bdaddr, &ev->bdaddr); >> >> - if (lmp_rswitch_capable(hdev) && (mask & >> HCI_LM_MASTER)) >> + if (lmp_rswitch_capable(hdev) && >> + ((mask & HCI_LM_MASTER) || >> + is_sco_active(hdev))) >> cp.role = 0x00; /* Become master */ >> else >> cp.role = 0x01; /* Remain slave */ >> -- >> 1.8.2.1 >> >> > --047d7bdc8ac427723204fc7cb8ef Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Gentle reminder.
Regards,
Kiran<= /div>


On 9 Jun= e 2014 11:38, Kiran Raparthy <kiran.kumar@linaro.org> w= rote:
Just a reminder.
Regard= s,
Kiran


On 1 June 2014 10:50, Kiran Kumar Rapart= hy <kiran.kumar@linaro.org> wrote:
From: "hyungseoung.yoo" <hyungseoung.yoo@= samsung.com>

Preserve the master role when SCO or eSCO is active
as this improves compatability with lots of
headset and chipset combinations.

This is one of the number of patches from the Android AOSP
common.git tree, which is used on almost all Android devices.
It looks like it would improve support for compatibility with
lot of headset,so I wanted to submit it for review to see
if it should go upstream.

v3: Fixed formatting issues pointed by Sergei

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: li= nux-bluetooth@vger.kernel.org
Cc: netdev@vger= .kernel.org
Cc: linux= -kernel@vger.kernel.org
Cc: Android Kernel Team <kernel-team@android.com>
Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: hyungseoung.yoo <hyungseoung.yoo@samsung.com>
Signed-off-by: Jaikumar Ganesh <jaikumarg@android.com>
[kiran: Added context to commit message]
Signed-off-by: Kiran Raparthy <kiran.kumar@linaro.org>
---
=C2=A0net/bluetooth/hci_event.c | 12 +++++++++++-
=C2=A01 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 15010a2..cfb1355 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1915,6 +1915,14 @@ unlock:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 hci_conn_check_pending(hdev);
=C2=A0}

+static inline bool is_sco_active(struct hci_dev *hdev)
+{
+ =C2=A0 =C2=A0 =C2=A0 if (hci_conn_hash_lookup_state(hdev, SCO_LINK, BT_CO= NNECTED) ||
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 hci_conn_hash_lookup_state(hdev, ESCO_= LINK, BT_CONNECTED))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return true;
+ =C2=A0 =C2=A0 =C2=A0 return false;
+}
+
=C2=A0static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff= *skb)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0 =C2=A0 struct hci_ev_conn_request *ev =3D (void *) skb= ->data;
@@ -1961,7 +1969,9 @@ static void hci_conn_request_evt(struct hci_dev *hdev= , struct sk_buff *skb)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 bacpy(&cp.bdaddr, &ev->bdaddr);

- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER)) + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 if (lmp_rswitch_capable(hdev) &&
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 ((mask & HCI_LM_MASTER) ||
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 is_sco_active(hdev)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cp.role =3D 0x00; /* Become master *= /
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cp.role =3D 0x01; /* Remain slave */=
--
1.8.2.1



--047d7bdc8ac427723204fc7cb8ef--