From: Haijun Liu Date: Thu, 30 Sep 2010 08:52:40 +0000 (+0800) Subject: Bluetooth: Update conf_state before send config_req out X-Git-Tag: v2.6.37-rc1~147^2~78^2~1^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab3e571564a5d8fa4923e2e858e574c931a014c7;p=karo-tx-linux.git Bluetooth: Update conf_state before send config_req out Update conf_state with L2CAP_CONF_REQ_SENT before send config_req out in l2cap_config_req(). Signed-off-by: Haijun Liu Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan --- diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 01c476239dd6..16049de49896 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -3171,6 +3171,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT)) { u8 buf[64]; + l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT; l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_CONF_REQ, l2cap_build_conf_req(sk, buf), buf); l2cap_pi(sk)->num_conf_req++;