From d0fef8084f25a00bcb545d63eea63d4d91df0eea Mon Sep 17 00:00:00 2001 From: Julian Elischer Date: Wed, 1 Dec 1999 08:05:56 +0000 Subject: [PATCH] change intial timeout for session negotiation from 1 to 2 seconds. One second was being hit too many times in normal situations. --- sys/netgraph/ng_pppoe.c | 5 +++-- sys/netgraph/ng_pppoe.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c index 836b2950ce2f..438464678b86 100644 --- a/sys/netgraph/ng_pppoe.c +++ b/sys/netgraph/ng_pppoe.c @@ -1426,8 +1426,9 @@ AAA case PPPOE_SREQ: m0 = m_copypacket(sp->neg->m, M_DONTWAIT); NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy); - neg->timeout_handle = timeout(pppoe_ticker, hook, hz); - neg->timeout = 2; + neg->timeout_handle = timeout(pppoe_ticker, hook, + (hz * PPPOE_INITIAL_TIMEOUT)); + neg->timeout = PPPOE_INITIAL_TIMEOUT * 2; break; default: diff --git a/sys/netgraph/ng_pppoe.h b/sys/netgraph/ng_pppoe.h index 3a97157750ad..41fecd11e982 100644 --- a/sys/netgraph/ng_pppoe.h +++ b/sys/netgraph/ng_pppoe.h @@ -126,6 +126,7 @@ struct ngpppoe_sts { #define PPPOE_TIMEOUT_LIMIT 64 #define PPPOE_OFFER_TIMEOUT 16 +#define PPPOE_INITIAL_TIMEOUT 2 /* Codes to identify message types */ #define PADI_CODE 0x09