Thread (29 messages) flat view 29 messages, 4 authors, 2012-05-28

Re: [PATCH -v2 05/12] Bluetooth: Use chan->state instead of sk->sk_state

From: Marcel Holtmann <marcel@holtmann.org>
Date: 2012-05-27 05:04:11

Hi Gustavo,
quoted hunk ↗ jump to hunk
These vars are kept in sync so we can use chan->state here.

Signed-off-by: Gustavo Padovan <redacted>
---
 net/bluetooth/l2cap_core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 3d35210..53e21ca 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1444,7 +1444,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 
 	lock_sock(sk);
 
-	switch (sk->sk_state) {
+	switch (chan->state) {
 	case BT_CONNECT:
 	case BT_CONNECT2:
 	case BT_CONFIG:
if this is so, then why are we bothering with the socket lock here?

Regards

Marcel

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help