From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> This renames FLAG_LE_CONN_REQ_SENT to FLAG_LE_FLOWCTL_CONN_REQ_SENT so it is consistent with the naming scheme used for enhanced flow control. Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> --- include/net/bluetooth/l2cap.h | 2 +- net/bluetooth/l2cap_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index d81ed537984f..3b323c54dd0c 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -765,7 +765,7 @@ enum { FLAG_EXT_CTRL, FLAG_EFS_ENABLE, FLAG_DEFER_SETUP, - FLAG_LE_CONN_REQ_SENT, + FLAG_LE_FLOWCTL_CONN_REQ_SENT, FLAG_EXT_FLOWCTL_CONN_REQ_SENT, FLAG_PENDING_SECURITY, FLAG_HOLD_HCI_CONN, diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index e6c8b2ed417f..da927fbb92a7 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1309,7 +1309,7 @@ static void l2cap_le_connect(struct l2cap_chan *chan) struct l2cap_conn *conn = chan->conn; struct l2cap_le_conn_req req; - if (test_and_set_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags)) + if (test_and_set_bit(FLAG_LE_FLOWCTL_CONN_REQ_SENT, &chan->flags)) return; if (!chan->imtu) @@ -5534,7 +5534,7 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn, chan->sec_level = sec_level; /* We'll need to send a new Connect Request */ - clear_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags); + clear_bit(FLAG_LE_FLOWCTL_CONN_REQ_SENT, &chan->flags); smp_conn_security(hcon, chan->sec_level); break; -- 2.21.0