summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian <brian@cvs.openbsd.org>1999-02-25 12:06:52 +0000
committerbrian <brian@cvs.openbsd.org>1999-02-25 12:06:52 +0000
commit28d50d56c5954a5671fadcae329909d0da83d6c4 (patch)
treeaf670454d41efb82fb5aeaf96a55d44e775aa4f1
parent63dad9db73900f9731bb3dcf60c76f857b44c2da (diff)
Don't immediately bring auto links back up in multilink
mode (when there is more than one auto link) if there is no data queued to go out. Reviewed by: Tom Torrance <tom@tomqnx.com>
-rw-r--r--usr.sbin/ppp/ppp/bundle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ppp/ppp/bundle.c b/usr.sbin/ppp/ppp/bundle.c
index 41ea14f1771..3b51352a615 100644
--- a/usr.sbin/ppp/ppp/bundle.c
+++ b/usr.sbin/ppp/ppp/bundle.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bundle.c,v 1.8 1999/02/06 03:22:31 brian Exp $
+ * $Id: bundle.c,v 1.9 1999/02/25 12:06:51 brian Exp $
*/
#include <sys/param.h>
@@ -526,8 +526,8 @@ bundle_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, int *n)
else if (bundle->autoload.timer.state != TIMER_RUNNING ||
bundle->autoload.comingup)
bundle_StartAutoLoadTimer(bundle, 0);
- } else if (bundle->autoload.timer.state != TIMER_RUNNING ||
- !bundle->autoload.comingup)
+ } else if (queued && (bundle->autoload.timer.state != TIMER_RUNNING ||
+ !bundle->autoload.comingup))
bundle_StartAutoLoadTimer(bundle, 1);
}