Received: by 10.223.185.111 with SMTP id b44csp919670wrg; Fri, 9 Mar 2018 16:53:01 -0800 (PST) X-Google-Smtp-Source: AG47ELtiCRB7sX+jYKqtyzpViv5NBe8aN88v506ItaqPSUy5gNfCtNuCHzXTJVlfnb79tEwoYzGo X-Received: by 10.99.107.131 with SMTP id g125mr343843pgc.16.1520643181314; Fri, 09 Mar 2018 16:53:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520643181; cv=none; d=google.com; s=arc-20160816; b=dLl69rofLBwIdUtYrII4ULgbTuhSBYFjYdbn1TOL+9H1FlmJWhG7tMIRgKwl1hbMKv QQ9RDTEjcJPEaoipX4iT3+U7Id2CtRSZL8EzAgIoJ/w9MLOnSu5xH4xmLVsMGXlJME+d wZD4cUeiqN0APhLSIUELpEDOEAYDuaeNJUJl/FKzFNE5GvYmNx6lhghcLAOf4yiLox/o wbYtVTfDTL+RmAe2WnsZJpMME+JKYNOECO3OkB5mDJX8TtRXpGqhng2iIhpFl/NijVWQ VrsBczmeEWLDuP/GEjhJuld5suPAlRppzMsMDYSCVe5mVhO8829CvT579438127gBHJC cOuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=i/tDe2/rjxJCgKXLePPQSVpC5PZY9p9ksT7cbBf3FWM=; b=FEgLjJ7mk0yUCUZ6USwUMMNAaFhiqbxcQuPgWjI6J4dV8a3Ei339Es8tMiFogV/aYc A7H1o/7AtcXvuuKWVuS1eoWBHD2Wmz+x/ZfGsRcLf/6fgHe0e2YFHLe3ER/yNCTerpW6 UtKbmH6dFiyd2Jlc0dNz6zjn3CikK52muhBw+ax5M8kgkHsmrzqCSbHkIwRyfIWZ6Jq2 57ZyPAFvECy/5VPChg7U0sCP/UKScOE1Flp4+13VDmD1etfhNZj+qTNsEJw7nowbXf6O 0JH1WvmckfrEdQoSRjcm8lAuE341u/1dMkSyUykupvPi3zEL5nncfTue1h6cvrRfwJQP RT1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o1-v6si1741714pld.546.2018.03.09.16.52.47; Fri, 09 Mar 2018 16:53:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933067AbeCJAvz (ORCPT + 99 others); Fri, 9 Mar 2018 19:51:55 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38558 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932571AbeCJATL (ORCPT ); Fri, 9 Mar 2018 19:19:11 -0500 Received: from localhost (unknown [185.236.200.248]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 18DD0EF8; Sat, 10 Mar 2018 00:19:10 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Denis Du , "David S. Miller" Subject: [PATCH 3.18 09/21] hdlc_ppp: carrier detect ok, dont turn off negotiation Date: Fri, 9 Mar 2018 16:18:31 -0800 Message-Id: <20180310001801.580621737@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180310001801.045114869@linuxfoundation.org> References: <20180310001801.045114869@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Denis Du [ Upstream commit b6c3bad1ba83af1062a7ff6986d9edc4f3d7fc8e ] Sometimes when physical lines have a just good noise to make the protocol handshaking fail, but the carrier detect still good. Then after remove of the noise, nobody will trigger this protocol to be start again to cause the link to never come back. The fix is when the carrier is still on, not terminate the protocol handshaking. Signed-off-by: Denis Du Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/wan/hdlc_ppp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -574,7 +574,10 @@ static void ppp_timer(unsigned long arg) ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0, 0, NULL); proto->restart_counter--; - } else + } else if (netif_carrier_ok(proto->dev)) + ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0, + 0, NULL); + else ppp_cp_event(proto->dev, proto->pid, TO_BAD, 0, 0, 0, NULL); break;