diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-25 19:43:39 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-07 18:06:26 -0300 |
| commit | 525cd1851b9faaadf5ea33e05192b8d22f42487e (patch) | |
| tree | ffc0483630e3ec505fa14fa3e4073ac08be596d2 /net/bluetooth/l2cap_sock.c | |
| parent | 710f9b0a423cad155144742f6497efe5163ed750 (diff) | |
| download | kernel_samsung_smdk4412-525cd1851b9faaadf5ea33e05192b8d22f42487e.zip kernel_samsung_smdk4412-525cd1851b9faaadf5ea33e05192b8d22f42487e.tar.gz kernel_samsung_smdk4412-525cd1851b9faaadf5ea33e05192b8d22f42487e.tar.bz2 | |
Bluetooth: Move conn_state to struct l2cap_chan
This is part of "moving things to l2cap_chan". As one the first move it
triggered a big number of changes in the funcions parameters, basically
changing the struct sock param to struct l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 450f57b..66ec966 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -778,14 +778,16 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms if (pi->mode == L2CAP_MODE_STREAMING) { l2cap_streaming_send(sk); - } else { - if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) && - (pi->conn_state & L2CAP_CONN_WAIT_F)) { - err = len; - break; - } - err = l2cap_ertm_send(sk); + err = len; + break; + } + + if ((pi->chan->conn_state & L2CAP_CONN_REMOTE_BUSY) && + (pi->chan->conn_state & L2CAP_CONN_WAIT_F)) { + err = len; + break; } + err = l2cap_ertm_send(pi->chan); if (err >= 0) err = len; |