From: Emeltchenko Andrei <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv5 08/16] Bluetooth: Add unlocked __l2cap_chan_add function
Date: Fri, 17 Feb 2012 15:44:04 +0200 [thread overview]
Message-ID: <1329486252-25252-9-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1329486252-25252-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
net/bluetooth/l2cap_core.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 1e3ebc5..db1640c 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -300,7 +300,7 @@ void l2cap_chan_destroy(struct l2cap_chan *chan)
l2cap_chan_put(chan);
}
-static void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
+void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
{
BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,
chan->psm, chan->dcid);
@@ -346,8 +346,13 @@ static void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
l2cap_chan_hold(chan);
- mutex_lock(&conn->chan_lock);
list_add(&chan->list, &conn->chan_l);
+}
+
+void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
+{
+ mutex_lock(&conn->chan_lock);
+ __l2cap_chan_add(conn, chan);
mutex_unlock(&conn->chan_lock);
}
--
1.7.9
next prev parent reply other threads:[~2012-02-17 13:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-17 13:43 [RFCv5 00/16] Bluetooth: Change socket lock to l2cap_chan lock Emeltchenko Andrei
2012-02-17 13:43 ` [RFCv5 01/16] Bluetooth: trivial: Fix long line Emeltchenko Andrei
2012-02-17 13:43 ` [RFCv5 02/16] Bluetooth: Revert to mutexes from RCU list Emeltchenko Andrei
2012-02-17 21:22 ` Ulisses Furquim
2012-02-19 19:49 ` Andrei Emeltchenko
2012-02-20 11:55 ` Ulisses Furquim
2012-02-20 12:17 ` Andrei Emeltchenko
2012-02-17 13:43 ` [RFCv5 03/16] Bluetooth: Lock chan list when deleting chan Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 04/16] Bluetooth: Do not use sk lock in get_chan functions Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 05/16] Bluetooth: Add l2cap_chan_lock Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 06/16] Bluetooth: Add locked and unlocked state_change Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 07/16] Bluetooth: Add socket error function Emeltchenko Andrei
2012-02-17 13:44 ` Emeltchenko Andrei [this message]
2012-02-17 13:44 ` [RFCv5 09/16] Bluetooth: Use chan lock in timers Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 10/16] Bluetooth: Use chan lock in L2CAP sig commands Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 11/16] Bluetooth: Use chan lock in L2CAP conn start Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 12/16] Bluetooth: Use chan lock in receiving data Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 13/16] Bluetooth: Change locking logic for conn/chan ready Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 14/16] Bluetooth: Change locking logic in security_cfm Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 15/16] Bluetooth: Use l2cap chan lock in socket connect Emeltchenko Andrei
2012-02-17 13:44 ` [RFCv5 16/16] Bluetooth: Remove socket lock check Emeltchenko Andrei
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=1329486252-25252-9-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.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).