linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
Subject: [PATCH v7 2/8] Bluetooth: Remove unused mask parameter in sco_conn_defer_accept
Date: Thu, 16 May 2013 19:33:59 +0200	[thread overview]
Message-ID: <1368725646-4593-3-git-send-email-frederic.dalleau@linux.intel.com> (raw)
In-Reply-To: <1368725646-4593-1-git-send-email-frederic.dalleau@linux.intel.com>

Signed-off-by: Frédéric Dalleau <frederic.dalleau@linux.intel.com>
---
 net/bluetooth/sco.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index a85182f..26c9d51 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -651,7 +651,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 	return err;
 }
 
-static void sco_conn_defer_accept(struct hci_conn *conn, int mask)
+static void sco_conn_defer_accept(struct hci_conn *conn)
 {
 	struct hci_dev *hdev = conn->hdev;
 
@@ -663,11 +663,7 @@ static void sco_conn_defer_accept(struct hci_conn *conn, int mask)
 		struct hci_cp_accept_conn_req cp;
 
 		bacpy(&cp.bdaddr, &conn->dst);
-
-		if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))
-			cp.role = 0x00; /* Become master */
-		else
-			cp.role = 0x01; /* Remain slave */
+		cp.role = 0x01; /* Remain slave */
 
 		hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp);
 	} else {
@@ -697,7 +693,7 @@ static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 
 	if (sk->sk_state == BT_CONNECT2 &&
 	    test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {
-		sco_conn_defer_accept(pi->conn->hcon, 0);
+		sco_conn_defer_accept(pi->conn->hcon);
 		sk->sk_state = BT_CONFIG;
 
 		release_sock(sk);
-- 
1.7.9.5


  parent reply	other threads:[~2013-05-16 17:33 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-16 17:33 [PATCH v7 0/8] sco: SCO socket option for voice_setting Frédéric Dalleau
2013-05-16 17:33 ` [PATCH v7 1/8] Bluetooth: Use hci_connect_sco directly Frédéric Dalleau
2013-05-16 17:33 ` Frédéric Dalleau [this message]
2013-05-17  8:40   ` [PATCH v7 2/8] Bluetooth: Remove unused mask parameter in sco_conn_defer_accept Marcel Holtmann
2013-05-16 17:34 ` [PATCH v7 3/8] Bluetooth: Add bluetooth socket voice option Frédéric Dalleau
2013-05-17  8:48   ` Marcel Holtmann
2013-05-16 17:34 ` [PATCH v7 4/8] Bluetooth: Constants and macro declaration for SCO airmode Frédéric Dalleau
2013-05-17  8:49   ` Marcel Holtmann
2013-05-16 17:34 ` [PATCH v7 5/8] Bluetooth: Use voice setting in incoming SCO connection Frédéric Dalleau
2013-05-17  8:51   ` Marcel Holtmann
2013-05-16 17:34 ` [PATCH v7 6/8] Bluetooth: Parameters for outgoing SCO connections Frédéric Dalleau
2013-05-17  8:55   ` Marcel Holtmann
2013-05-17 13:10     ` Vinicius Gomes
2013-05-16 17:34 ` [PATCH v7 7/8] Bluetooth: Fallback transparent SCO from T2 to T1 Frédéric Dalleau
2013-05-17  9:00   ` Marcel Holtmann
2013-05-16 17:34 ` [PATCH v7 8/8] Bluetooth: Add support for fallback between CVSD recommended settings Frédéric Dalleau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1368725646-4593-3-git-send-email-frederic.dalleau@linux.intel.com \
    --to=frederic.dalleau@linux.intel.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).