From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EEC7C433DF for ; Thu, 18 Jun 2020 02:00:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E90C22203 for ; Thu, 18 Jun 2020 02:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592445655; bh=j35GjtgYFSDwHm2rZ/rpBi2m9NIfqWMWJfrXEDFLb5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MNWQ3CDpERmNLyPOXRFPMt2cr+L9aAjyPaVOz8JAcFCwu2/TH5Ot2Ebt5IzD3CT36 2h0+72vHsYh/4hAsitCw/vQW2DdUQv6nHgnMTcLfGk10JrQMwqt8EmXOE7TfhTAjPc Xjq0j42DRMNhCIBVS0G0kuNKZUYZ31zbWC/eLlhw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387443AbgFRCAw (ORCPT ); Wed, 17 Jun 2020 22:00:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:58652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731151AbgFRBYP (ORCPT ); Wed, 17 Jun 2020 21:24:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4539A20B1F; Thu, 18 Jun 2020 01:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443454; bh=j35GjtgYFSDwHm2rZ/rpBi2m9NIfqWMWJfrXEDFLb5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q5CgjE3y/6RSVuIkb0cL9JwZGhh4s3I2eQkR/xPBFjFx7RTFWaUJ+8onKBFWUh7aH 7yWXqFKPsl+24ZYfm+y/GwJkIldEttHfKGuJ1I4nJdueIi/JIUK2APwBvP36lgIi3D Sfvq1XbkvQ3kvOH8xZU5yH6pmJlV2fC+xd2YP8OA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gregory CLEMENT , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.19 089/172] tty: n_gsm: Fix SOF skipping Date: Wed, 17 Jun 2020 21:20:55 -0400 Message-Id: <20200618012218.607130-89-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gregory CLEMENT [ Upstream commit 84d6f81c1fb58b56eba81ff0a36cf31946064b40 ] For at least some modems like the TELIT LE910, skipping SOF makes transfers blocking indefinitely after a short amount of data transferred. Given the small improvement provided by skipping the SOF (just one byte on about 100 bytes), it seems better to completely remove this "feature" than make it optional. Fixes: e1eaea46bb40 ("tty: n_gsm line discipline") Signed-off-by: Gregory CLEMENT Link: https://lore.kernel.org/r/20200512115323.1447922-3-gregory.clement@bootlin.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/n_gsm.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 86b7e20ffd7f..8d8229dd2796 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -669,7 +669,6 @@ static void gsm_data_kick(struct gsm_mux *gsm) { struct gsm_msg *msg, *nmsg; int len; - int skip_sof = 0; list_for_each_entry_safe(msg, nmsg, &gsm->tx_list, list) { if (gsm->constipated && msg->addr) @@ -691,15 +690,10 @@ static void gsm_data_kick(struct gsm_mux *gsm) print_hex_dump_bytes("gsm_data_kick: ", DUMP_PREFIX_OFFSET, gsm->txframe, len); - - if (gsm->output(gsm, gsm->txframe + skip_sof, - len - skip_sof) < 0) + if (gsm->output(gsm, gsm->txframe, len) < 0) break; /* FIXME: Can eliminate one SOF in many more cases */ gsm->tx_bytes -= msg->len; - /* For a burst of frames skip the extra SOF within the - burst */ - skip_sof = 1; list_del(&msg->list); kfree(msg); -- 2.25.1