Re: [PATCH] Bluetooth: Change chan_ready param from sk to chan
From: Ulisses Furquim <hidden>
Date: 2012-01-26 03:04:06
Hi Andrei, On Wed, Jan 25, 2012 at 12:09 PM, Emeltchenko Andrei [off-list ref] wrote:
From: Andrei Emeltchenko <redacted> Change is needed to remove dependency on sk when possible before introducing l2cap channel lock.
What's the overall idea? We used to rely on sk lock for mutual exclusion, right? (please correct me if I'm wrong) I'm seeing some patches from you to change from sk to chan but introducing another lock might shake things a bit so that's why I'm asking for the big picture, if you have thought this through already. Thanks, -- Ulisses
quoted hunk ↗ jump to hunk
Signed-off-by: Andrei Emeltchenko <redacted> --- net/bluetooth/l2cap_core.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 69e8490..c330cdc 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c@@ -907,9 +907,9 @@ clean:release_sock(parent); } -static void l2cap_chan_ready(struct sock *sk) +static void l2cap_chan_ready(struct l2cap_chan *chan) { - struct l2cap_chan *chan = l2cap_pi(sk)->chan; + struct sock *sk = chan->sk; struct sock *parent = bt_sk(sk)->parent; BT_DBG("sk %p, parent %p", sk, parent);@@ -945,7 +945,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)if (conn->hcon->type == LE_LINK) { if (smp_conn_security(conn, chan->sec_level)) - l2cap_chan_ready(sk); + l2cap_chan_ready(chan); } else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) { __clear_chan_timer(chan);@@ -2874,7 +2874,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdrif (chan->mode == L2CAP_MODE_ERTM) l2cap_ertm_init(chan); - l2cap_chan_ready(sk); + l2cap_chan_ready(chan); goto unlock; }@@ -3005,7 +3005,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdrif (chan->mode == L2CAP_MODE_ERTM) l2cap_ertm_init(chan); - l2cap_chan_ready(sk); + l2cap_chan_ready(chan); } done:@@ -4524,7 +4524,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)if (chan->scid == L2CAP_CID_LE_DATA) { if (!status && encrypt) { chan->sec_level = hcon->sec_level; - l2cap_chan_ready(sk); + l2cap_chan_ready(chan); } bh_unlock_sock(sk); -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
-- Ulisses Furquim ProFUSION embedded systems http://profusion.mobi Mobile: +55 19 9250 0942 Skype: ulissesffs