[src/netbsd-1-6]: src/sys/netinet Pull up revision 1.73 (requested by itojun ...

[grant <grant%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2cc820ff3411
branches:  netbsd-1-6
changeset: 530466:2cc820ff3411
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 30 02:24:51 2003 +0000

description:
Pull up revision 1.73 (requested by itojun in ticket #1345):

expire mrt if mrt_stall goes empty.  ono@kame

diffstat:

 sys/netinet/ip_mroute.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 973069faf128 -r 2cc820ff3411 sys/netinet/ip_mroute.c
--- a/sys/netinet/ip_mroute.c   Mon Jun 30 02:23:06 2003 +0000
+++ b/sys/netinet/ip_mroute.c   Mon Jun 30 02:24:51 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_mroute.c,v 1.59.8.2 2003/06/30 02:21:02 grant Exp $ */
+/*     $NetBSD: ip_mroute.c,v 1.59.8.3 2003/06/30 02:24:51 grant Exp $ */
 
 /*
  * Copyright (c) 1989 Stephen Deering
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.59.8.2 2003/06/30 02:21:02 grant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.59.8.3 2003/06/30 02:24:51 grant Exp $");
 
 #include "opt_ipsec.h"
 
@@ -498,6 +498,8 @@
        }
        for (i = 0; i < MFCTBLSIZ; i++) {
                for (rt = LIST_FIRST(&mfchashtbl[i]); rt; rt = nrt) {
+                       nrt = LIST_NEXT(rt, mfc_hash);
+
                        prte = &rt->mfc_stall;
                        for (rte = *prte; rte; rte = nrte) {
                                nrte = rte->next;
@@ -508,6 +510,12 @@
                                } else
                                        prte = &rte->next;
                        }
+
+                       if (rt->mfc_expire == 0)
+                               continue;
+                       nexpire[i]--;
+                       ++mrtstat.mrts_cache_cleanups;
+                       expire_mfc(rt);
                }
        }
 }