summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/contrib/altq/altq/altq_subr.c31
1 files changed, 21 insertions, 10 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c
index 6febbab..17557c1 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -454,7 +454,9 @@ static void
tbr_timeout(arg)
void *arg;
{
- INIT_VNET_NET(curvnet);
+#if defined(__FreeBSD__)
+ VNET_ITERATOR_DECL(vnet_iter);
+#endif
struct ifnet *ifp;
int active, s;
@@ -466,16 +468,25 @@ tbr_timeout(arg)
#endif
#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000)
IFNET_RLOCK();
-#endif
- for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
- /* read from if_snd unlocked */
- if (!TBR_IS_ENABLED(&ifp->if_snd))
- continue;
- active++;
- if (!IFQ_IS_EMPTY(&ifp->if_snd) && ifp->if_start != NULL)
- (*ifp->if_start)(ifp);
- }
+ VNET_LIST_RLOCK();
+ VNET_FOREACH(vnet_iter) {
+ CURVNET_SET(vnet_iter);
+ INIT_VNET_NET(vnet_iter);
+#endif
+ for (ifp = TAILQ_FIRST(&V_ifnet); ifp;
+ ifp = TAILQ_NEXT(ifp, if_list)) {
+ /* read from if_snd unlocked */
+ if (!TBR_IS_ENABLED(&ifp->if_snd))
+ continue;
+ active++;
+ if (!IFQ_IS_EMPTY(&ifp->if_snd) &&
+ ifp->if_start != NULL)
+ (*ifp->if_start)(ifp);
+ }
#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000)
+ CURVNET_RESTORE();
+ }
+ VNET_LIST_RUNLOCK();
IFNET_RUNLOCK();
#endif
splx(s);
OpenPOWER on IntegriCloud