diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index efb9b7f422d1..54eddcdd341f 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -725,7 +725,6 @@ enum {
 	CONF_CONNECT_PEND,
 	CONF_RECV_NO_FCS,
 	CONF_STATE2_DEVICE,
-	CONF_EWS_RECV,
 	CONF_LOC_CONF_PEND,
 	CONF_REM_CONF_PEND,
 	CONF_NOT_COMPLETE,
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 210d1507af7e..4dd56e0074fd 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3769,11 +3769,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data
 				rfc.txwin_size = L2CAP_DEFAULT_TX_WINDOW;
 				remote_efs = 0;
 			} else {
-				if (!test_bit(CONF_EWS_RECV, &chan->conf_state))
-					chan->remote_tx_win = rfc.txwin_size;
-				else
-					rfc.txwin_size = L2CAP_DEFAULT_TX_WINDOW;
-
+				chan->remote_tx_win = rfc.txwin_size;
 				chan->remote_max_tx = rfc.max_transmit;
 				chan->remote_mps = size;
 			}
@@ -4512,7 +4508,7 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn,
 		break;
 
 	case L2CAP_CR_PEND:
-		set_bit(CONF_CONNECT_PEND, &chan->conf_state);
+		/* Our request is still outstanding */
 		break;
 
 	default: