Hi,

On Wed, May 28, 2014 at 8:56 AM, Kiran Kumar Raparthy
<kiran.ku...@linaro.org> wrote:
> From: "hyungseoung.yoo" <hyungseoung....@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.
>
> Cc: Marcel Holtmann <mar...@holtmann.org> (maintainer:BLUETOOTH SUBSYSTEM)
> Cc: Gustavo Padovan <gust...@padovan.org> (maintainer:BLUETOOTH SUBSYSTEM)
> Cc: Johan Hedberg <johan.hedb...@gmail.com> (maintainer:BLUETOOTH SUBSYSTEM)
> Cc: "David S. Miller" <da...@davemloft.net> (maintainer:NETWORKING [GENERAL])
> Cc: linux-blueto...@vger.kernel.org (open list:BLUETOOTH SUBSYSTEM)
> Cc: net...@vger.kernel.org (open list:NETWORKING [GENERAL])
> Cc: linux-kernel@vger.kernel.org (open list)
> Cc: Android Kernel Team <kernel-t...@android.com>
> Cc: John Stultz <john.stu...@linaro.org>
> Signed-off-by: hyungseoung.yoo <hyungseoung....@samsung.com>
> Signed-off-by: Jaikumar Ganesh <jaikum...@android.com>
> [kiran: Added context to commit message]
> Signed-off-by: Kiran Raparthy <kiran.ku...@linaro.org>
> ---
>  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..6f944d5 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -1915,6 +1915,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;
> +}
> +
>  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 +1970,8 @@ 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

I guess the real issue is the possibility of creating a scatternet if
you have more than one connection, I will send a patch for scatternet
shortly but that does not guarantee the remote device wont reject it.


-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to