Make IP fastforwarding ALTQ-aware by adding the input traffic conditioner

check and disabling the early output interface queue length check.
This commit is contained in:
Andre Oppermann 2004-08-11 10:42:59 +00:00
parent 3caccfd90f
commit de2e5d1e20

View File

@ -283,6 +283,14 @@ ip_fastforward(struct mbuf *m)
goto drop; goto drop;
} }
#ifdef ALTQ
/*
* Is packet dropped by traffic conditioner?
*/
if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0)
return 1;
#endif
/* /*
* Step 2: fallback conditions to normal ip_input path processing * Step 2: fallback conditions to normal ip_input path processing
*/ */
@ -669,6 +677,7 @@ ip_fastforward(struct mbuf *m)
goto consumed; goto consumed;
} }
#ifndef ALTQ
/* /*
* Check if there is enough space in the interface queue * Check if there is enough space in the interface queue
*/ */
@ -678,6 +687,7 @@ ip_fastforward(struct mbuf *m)
/* would send source quench here but that is depreciated */ /* would send source quench here but that is depreciated */
goto drop; goto drop;
} }
#endif
/* /*
* Check if media link state of interface is not down * Check if media link state of interface is not down