From c5caf262dd2963052930246666983939cc4be0c9 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 3 Jul 2006 10:37:55 +0200
Subject: [PATCH] --- yaml --- r: 31967 b: refs/heads/master c:
 300b93974ff64f1bef1ac8294547c573954f0300 h: refs/heads/master i:   31965:
 35e45ad9c3083ab2b405cb7524314e4002aafb5c   31963:
 1ff0a9630fb53ca765ef1a5ef79e8d431bfefc42   31959:
 3c06bdb1523686895b3a4086e641d5e3d5cb4df8   31951:
 d901d282cffdd67cc44282ed1f6c8e093a0f1d92   31935:
 6e96dade448e4f1dd070bc04faafc83c2912082f v: v3

---
 [refs]                            | 2 +-
 trunk/net/bluetooth/rfcomm/core.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 75302cf4c01e..d214b76ceeac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c2660b00fae0575dd4ce5c7b6bf30762b632045
+refs/heads/master: 300b93974ff64f1bef1ac8294547c573954f0300
diff --git a/trunk/net/bluetooth/rfcomm/core.c b/trunk/net/bluetooth/rfcomm/core.c
index fe18dc2dd3c1..155a2b93760e 100644
--- a/trunk/net/bluetooth/rfcomm/core.c
+++ b/trunk/net/bluetooth/rfcomm/core.c
@@ -1150,6 +1150,8 @@ static inline int rfcomm_check_link_mode(struct rfcomm_dlc *d)
 
 static void rfcomm_dlc_accept(struct rfcomm_dlc *d)
 {
+	struct sock *sk = d->session->sock->sk;
+
 	BT_DBG("dlc %p", d);
 
 	rfcomm_send_ua(d->session, d->dlci);
@@ -1159,6 +1161,9 @@ static void rfcomm_dlc_accept(struct rfcomm_dlc *d)
 	d->state_change(d, 0);
 	rfcomm_dlc_unlock(d);
 
+	if (d->link_mode & RFCOMM_LM_MASTER)
+		hci_conn_switch_role(l2cap_pi(sk)->conn->hcon, 0x00);
+
 	rfcomm_send_msc(d->session, 1, d->dlci, d->v24_sig);
 }