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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 936EDC4332B for ; Wed, 23 Dec 2020 02:46:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60C3C22573 for ; Wed, 23 Dec 2020 02:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730044AbgLWCqZ (ORCPT ); Tue, 22 Dec 2020 21:46:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:49842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729679AbgLWCW2 (ORCPT ); Tue, 22 Dec 2020 21:22:28 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB2D4225AC; Wed, 23 Dec 2020 02:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608690130; bh=HfVA3vP2LuBtbMR4z27FBgM5pcDNqiAe2EtyXsfKt8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s+zbhVy9ZeicbcQHVgvUUCI8M3BZ1D4cIei5J9CNurZZs2XYEkBAGeC3vWmDKLLgs d9eIwsLyqapVLd1cT2AZF2izIqcXSIUlhsbOuEzvYEDzs7fh8WAN/PVU7uaYmkVorR 5lq+Y4sBmZ+tgy5v7tscY+RJnb+MP35/fflTHsmaWH3U+PScopNKwGiIrsSxGmo2K0 nJCInXbyIP66FD7+4X++4fq4JjRxR8LKoL2kqMqpU7h3wbEADUcfuGcX7ZioIfio/n R4yKtdDKq3+OtK6+Uqi9n+XrxbFXNOYgTmdJ7Wr9Ztu73zaK1sfboj99xtMSGWM0pp FcLg9kWZsJRxQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Schiller , Jakub Kicinski , Sasha Levin , linux-x25@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 54/87] net/lapb: fix t1 timer handling for LAPB_STATE_0 Date: Tue, 22 Dec 2020 21:20:30 -0500 Message-Id: <20201223022103.2792705-54-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201223022103.2792705-1-sashal@kernel.org> References: <20201223022103.2792705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Martin Schiller [ Upstream commit 62480b992ba3fb1d7260b11293aed9d6557831c7 ] 1. DTE interface changes immediately to LAPB_STATE_1 and start sending SABM(E). 2. DCE interface sends N2-times DM and changes to LAPB_STATE_1 afterwards if there is no response in the meantime. Signed-off-by: Martin Schiller Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/lapb/lapb_timer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 5d4ae01951b56..51fc09fa41247 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -90,11 +90,18 @@ static void lapb_t1timer_expiry(struct timer_list *t) switch (lapb->state) { /* - * If we are a DCE, keep going DM .. DM .. DM + * If we are a DCE, send DM up to N2 times, then switch to + * STATE_1 and send SABM(E). */ case LAPB_STATE_0: - if (lapb->mode & LAPB_DCE) + if (lapb->mode & LAPB_DCE && + lapb->n2count != lapb->n2) { + lapb->n2count++; lapb_send_control(lapb, LAPB_DM, LAPB_POLLOFF, LAPB_RESPONSE); + } else { + lapb->state = LAPB_STATE_1; + lapb_establish_data_link(lapb); + } break; /* -- 2.27.0