summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap.c
diff options
context:
space:
mode:
authorHaijun Liu2010-09-30 10:52:40 +0200
committerGustavo F. Padovan2010-10-12 17:44:53 +0200
commitab3e571564a5d8fa4923e2e858e574c931a014c7 (patch)
tree40d29b990ea779b1c68c2a72ccde93c84c0a1b0f /net/bluetooth/l2cap.c
parentBluetooth: Use the proper error value from bt_skb_send_alloc() (diff)
downloadkernel-qcow2-linux-ab3e571564a5d8fa4923e2e858e574c931a014c7.tar.gz
kernel-qcow2-linux-ab3e571564a5d8fa4923e2e858e574c931a014c7.tar.xz
kernel-qcow2-linux-ab3e571564a5d8fa4923e2e858e574c931a014c7.zip
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 <haijun.liu@atheros.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r--net/bluetooth/l2cap.c1
1 files changed, 1 insertions, 0 deletions
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++;