From owner-freebsd-net@FreeBSD.ORG  Sat Jun 19 23:20:39 2004
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4187B16A4CE
	for <net@freebsd.org>; Sat, 19 Jun 2004 23:20:39 +0000 (GMT)
Received: from hanoi.cronyx.ru (hanoi.cronyx.ru [144.206.181.53])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 24DD943D2F
	for <net@freebsd.org>; Sat, 19 Jun 2004 23:20:36 +0000 (GMT)
	(envelope-from rik@cronyx.ru)
Received: (from root@localhost) by hanoi.cronyx.ru
  id i5JNHBhA001696 for net@freebsd.org.checked; (8.12.8/vak/2.1)
  Sun, 20 Jun 2004 03:17:11 +0400 (MSD) (envelope-from rik@cronyx.ru)
Received: from cronyx.ru (rik.cronyx.ru [172.22.4.1]) by hanoi.cronyx.ru with
	ESMTP  id i5JNFPAY001573; (8.12.8/vak/2.1)
	Sun, 20 Jun 2004 03:15:26 +0400 (MSD) (envelope-from rik@cronyx.ru)
Message-ID: <40D4C79B.2050400@cronyx.ru>
Date: Sun, 20 Jun 2004 03:09:15 +0400
From: Roman Kurakin <rik@cronyx.ru>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.2.1) Gecko/20030426
X-Accept-Language: ru-ru, en
MIME-Version: 1.0
To: net@freebsd.org
Content-Type: multipart/mixed;
 boundary="------------060602090403030304070006"
cc: joerg@freebsd.org
Subject: if_sppp
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jun 2004 23:20:39 -0000

This is a multi-part message in MIME format.
--------------060602090403030304070006
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

	I want to propose a patch for sppp.

Problem:
	If we have max_failure < MAXALIVECNT*5 we will
send conf-rej for magic.

Solution:
	Loopback could be treated as a special case and
thus we may not count it as a failure.



--------------060602090403030304070006
Content-Type: text/plain;
 name="if_sppp.pch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="if_sppp.pch"

Index: if_spppsubr.c
===================================================================
RCS file: /CVS/FreeBSD/src/sys/net/if_spppsubr.c,v
retrieving revision 1.110
diff -u -r1.110 if_spppsubr.c
--- if_spppsubr.c	15 Jun 2004 23:57:41 -0000	1.110
+++ if_spppsubr.c	19 Jun 2004 22:51:13 -0000
@@ -2381,7 +2381,8 @@
 				lcp.Down(sp);
 				lcp.Up(sp);
 			}
-		} else if (++sp->fail_counter[IDX_LCP] >= sp->lcp.max_failure) {
+		} else if (!sp->pp_loopcnt &&
+			   ++sp->fail_counter[IDX_LCP] >= sp->lcp.max_failure) {
 			if (debug)
 				log(-1, " max_failure (%d) exceeded, "
 				       "send conf-rej\n",

--------------060602090403030304070006--