diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-10-20 13:35:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-22 02:59:40 -0700 |
| commit | 876d9484edf77d228adb42aecd4debd58d7739d6 (patch) | |
| tree | 7812471a62fe26a8cf86d2b8fe5584396527de40 /net/bluetooth | |
| parent | a9de9248064bfc8eb0a183a6a951a4e7b5ca10a4 (diff) | |
| download | kernel-crypto-876d9484edf77d228adb42aecd4debd58d7739d6.tar.gz kernel-crypto-876d9484edf77d228adb42aecd4debd58d7739d6.tar.xz kernel-crypto-876d9484edf77d228adb42aecd4debd58d7739d6.zip | |
[Bluetooth] Finish L2CAP configuration only with acceptable settings
The parameters of the L2CAP output configuration might not be accepted
after the first configuration round. So only indicate a finished output
configuration when acceptable settings are provided.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 36ef27b625d..6ce693d2e5b 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -1370,8 +1370,10 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) if (pi->conf_mtu < pi->omtu) result = L2CAP_CONF_UNACCEPT; - else + else { pi->omtu = pi->conf_mtu; + pi->conf_state |= L2CAP_CONF_OUTPUT_DONE; + } l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->omtu); } @@ -1577,16 +1579,19 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, len, rsp); - /* Output config done. */ - l2cap_pi(sk)->conf_state |= L2CAP_CONF_OUTPUT_DONE; - /* Reset config buffer. */ l2cap_pi(sk)->conf_len = 0; + if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_OUTPUT_DONE)) + goto unlock; + if (l2cap_pi(sk)->conf_state & L2CAP_CONF_INPUT_DONE) { sk->sk_state = BT_CONNECTED; l2cap_chan_ready(sk); - } else if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT)) { + goto unlock; + } + + if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT)) { u8 req[64]; l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ, l2cap_build_conf_req(sk, req), req); @@ -1646,7 +1651,6 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr if (flags & 0x01) goto done; - /* Input config done */ l2cap_pi(sk)->conf_state |= L2CAP_CONF_INPUT_DONE; if (l2cap_pi(sk)->conf_state & L2CAP_CONF_OUTPUT_DONE) { |