Merge 5.18-rc5 into tty-next

[linux-2.6-microblaze.git] / drivers / tty / n_gsm.c

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index a38b922..eaa12b4 100644 (file)
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -748,7 +748,7 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
 
        *--dp = msg->ctrl;
        if (gsm->initiator)
-               *--dp = (msg->addr << 2) | 2 | EA;
+               *--dp = (msg->addr << 2) | CR | EA;
        else
                *--dp = (msg->addr << 2) | EA;
        *fcs = gsm_fcs_add_block(INIT_FCS, dp , msg->data - dp);
@@ -1905,10 +1905,6 @@ static void gsm_queue(struct gsm_mux *gsm)
        case UI|PF:
        case UIH:
        case UIH|PF:
-#if 0
-               if (cr)
-                       goto invalid;
-#endif
                if (dlci == NULL || dlci->state != DLCI_OPEN) {
                        gsm_command(gsm, address, DM|PF);
                        return;