From: Gustavo Padovan <gustavo@padovan.org>
To: linux-bluetooth@vger.kernel.org
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Subject: [RFC -v2 07/16] Bluetooth: duplicate DEFER_SETUP flag on l2cap_chan
Date: Fri, 21 Dec 2012 16:10:50 -0200 [thread overview]
Message-ID: <1356113459-7932-8-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1356113459-7932-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Now l2cap_chan also has the DEFER_SETUP flag, so we don't need to access
the bt_sk(sk) to read this flag inside l2cap_core.c. We need to kep it
duplicate since it is used in Bluetooth socket code as well.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
include/net/bluetooth/l2cap.h | 1 +
net/bluetooth/l2cap_core.c | 16 +++++++---------
net/bluetooth/l2cap_sock.c | 7 +++++--
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 4f28a8c..0c76c55 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -635,6 +635,7 @@ enum {
CONN_REJ_ACT,
CONN_SEND_FBIT,
CONN_RNR_SENT,
+ CONN_DEFER_SETUP,
};
/* Definitions for flags in l2cap_chan */
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index af8783a..4cc49f3 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -620,10 +620,8 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
void l2cap_chan_close(struct l2cap_chan *chan, int reason)
{
struct l2cap_conn *conn = chan->conn;
- struct sock *sk = chan->sk;
- BT_DBG("chan %p state %s sk %p", chan, state_to_string(chan->state),
- sk);
+ BT_DBG("chan %p state %s", chan, state_to_string(chan->state));
switch (chan->state) {
case BT_LISTEN:
@@ -646,7 +644,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
struct l2cap_conn_rsp rsp;
__u16 result;
- if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags))
+ if (test_bit(CONN_DEFER_SETUP, &chan->conn_state))
result = L2CAP_CR_SEC_BLOCK;
else
result = L2CAP_CR_BAD_PSM;
@@ -1255,8 +1253,8 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
if (l2cap_chan_check_security(chan)) {
lock_sock(sk);
- if (test_bit(BT_SK_DEFER_SETUP,
- &bt_sk(sk)->flags)) {
+ if (test_bit(CONN_DEFER_SETUP,
+ &chan->conn_state)) {
rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);
rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
chan->ops->defer(chan);
@@ -3642,7 +3640,7 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,
if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_DONE) {
if (l2cap_chan_check_security(chan)) {
- if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {
+ if (test_bit(CONN_DEFER_SETUP, &chan->conn_state)) {
__l2cap_state_change(chan, BT_CONNECT2);
result = L2CAP_CR_PEND;
status = L2CAP_CS_AUTHOR_PEND;
@@ -6402,8 +6400,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
lock_sock(sk);
if (!status) {
- if (test_bit(BT_SK_DEFER_SETUP,
- &bt_sk(sk)->flags)) {
+ if (test_bit(CONN_DEFER_SETUP,
+ &chan->conn_state)) {
res = L2CAP_CR_PEND;
stat = L2CAP_CS_AUTHOR_PEND;
chan->ops->defer(chan);
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 8adea0f..9cd6fba 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -659,10 +659,13 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
break;
}
- if (opt)
+ if (opt) {
set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
- else
+ set_bit(CONN_DEFER_SETUP, &chan->conn_state);
+ } else {
clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
+ clear_bit(CONN_DEFER_SETUP, &chan->conn_state);
+ }
break;
case BT_FLUSHABLE:
--
1.8.0.2
next prev parent reply other threads:[~2012-12-21 18:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-21 18:10 [RFC -v2 00/16] Completely remove socket dependency from l2cap_core.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 01/16] Bluetooth: Add src and dst info to struct l2cap_chan Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 02/16] Bluetooth: Remove sk_sndtimeo from l2cap_core.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 03/16] Bluetooth: extend state_change() call to report errors too Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 04/16] Bluetooth: add l2cap_state_change_and_error() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 05/16] Bluetooth: Add missing braces to an "else if" Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 06/16] Bluetooth: use l2cap_chan_ready() instead of duplicate code Gustavo Padovan
2012-12-21 18:10 ` Gustavo Padovan [this message]
2012-12-21 18:10 ` [RFC -v2 08/16] Bluetooth: Improving locking in l2cap_conn_start() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 09/16] Bluetooth: lock socket in defer_cb call Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 10/16] Bluetooth: Remove socket lock from state_change() in l2cap_core Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 11/16] Bluetooth: remove parent socket usage from l2cap_core.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 12/16] Bluetooth: Use abstract chan->data in comparison Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 13/16] Bluetooth: Move l2cap_wait_ack() to l2cap_sock.c Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 14/16] Bluetooth: Create l2cap->ops->resume() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 15/16] Bluetooth: Create l2cap->ops->set_shutdown() Gustavo Padovan
2012-12-21 18:10 ` [RFC -v2 16/16] Bluetooth: Remove sk member from struct l2cap_chan Gustavo Padovan
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=1356113459-7932-8-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=gustavo.padovan@collabora.co.uk \
--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