Commit a17a125c authored by Maksim Krasnyanskiy's avatar Maksim Krasnyanskiy

[Bluetooth] L2CAP qualification spec mandates sending additional config request

if we receive config response with unacceptable parameters error code. 
So we now send dummy request to keep tester happy.
parent f699cb6a
...@@ -220,6 +220,7 @@ struct l2cap_pinfo { ...@@ -220,6 +220,7 @@ struct l2cap_pinfo {
__u32 link_mode; __u32 link_mode;
__u8 conf_state; __u8 conf_state;
__u8 conf_retry;
__u16 conf_mtu; __u16 conf_mtu;
__u8 ident; __u8 ident;
...@@ -234,6 +235,7 @@ struct l2cap_pinfo { ...@@ -234,6 +235,7 @@ struct l2cap_pinfo {
#define L2CAP_CONF_REQ_SENT 0x01 #define L2CAP_CONF_REQ_SENT 0x01
#define L2CAP_CONF_INPUT_DONE 0x02 #define L2CAP_CONF_INPUT_DONE 0x02
#define L2CAP_CONF_OUTPUT_DONE 0x04 #define L2CAP_CONF_OUTPUT_DONE 0x04
#define L2CAP_CONF_MAX_RETRIES 2
void l2cap_load(void); void l2cap_load(void);
......
...@@ -1526,18 +1526,35 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr ...@@ -1526,18 +1526,35 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, scid))) if (!(sk = l2cap_get_chan_by_scid(&conn->chan_list, scid)))
return -ENOENT; return -ENOENT;
if (result) { switch (result) {
struct l2cap_disconn_req req; case L2CAP_CONF_SUCCESS:
break;
/* They didn't like our options. Well... we do not negotiate. case L2CAP_CONF_UNACCEPT:
* Close channel. if (++l2cap_pi(sk)->conf_retry < L2CAP_CONF_MAX_RETRIES) {
*/ char req[128];
/*
It does not make sense to adjust L2CAP parameters
that are currently defined in the spec. We simply
resend config request that we sent earlier. It is
stupid :) but it helps qualification testing
which expects at least some response from us.
*/
l2cap_send_req(conn, L2CAP_CONF_REQ,
l2cap_build_conf_req(sk, req), req);
goto done;
}
default:
sk->sk_state = BT_DISCONN; sk->sk_state = BT_DISCONN;
sk->sk_err = ECONNRESET;
l2cap_sock_set_timer(sk, HZ * 5); l2cap_sock_set_timer(sk, HZ * 5);
{
req.dcid = __cpu_to_le16(l2cap_pi(sk)->dcid); struct l2cap_disconn_req req;
req.scid = __cpu_to_le16(l2cap_pi(sk)->scid); req.dcid = __cpu_to_le16(l2cap_pi(sk)->dcid);
l2cap_send_req(conn, L2CAP_DISCONN_REQ, sizeof(req), &req); req.scid = __cpu_to_le16(l2cap_pi(sk)->scid);
l2cap_send_req(conn, L2CAP_DISCONN_REQ, sizeof(req), &req);
}
goto done; goto done;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment