Bluetooth: Remove check for supported mode

Since now we have checks for the supported mode before on
l2cap_info_rsp we can remove the check for it here.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index c590408..2fb45c4 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2473,15 +2473,10 @@ static int l2cap_build_conf_req(struct sock *sk, void *data)
        switch (pi->mode) {
        case L2CAP_MODE_STREAMING:
        case L2CAP_MODE_ERTM:
-               if (!(pi->conf_state & L2CAP_CONF_STATE2_DEVICE)) {
-                       pi->mode = l2cap_select_mode(rfc.mode,
-                                       pi->conn->feat_mask);
+               if (pi->conf_state & L2CAP_CONF_STATE2_DEVICE)
                        break;
-               }
 
-               if (!l2cap_mode_supported(pi->mode, pi->conn->feat_mask))
-                       l2cap_send_disconn_req(pi->conn, sk, ECONNRESET);
-               break;
+               /* fall through */
        default:
                pi->mode = l2cap_select_mode(rfc.mode, pi->conn->feat_mask);
                break;