summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorKenjiro Cho <kjc@cvs.openbsd.org>2001-06-27 05:50:08 +0000
committerKenjiro Cho <kjc@cvs.openbsd.org>2001-06-27 05:50:08 +0000
commit70a972f851feb0804a5c47063ffa69cb44987cfc (patch)
tree7b1f343f4a6acd5fdb2c1ceaa89a629ca3549ecf /sys/netinet
parentad7cd8f1ebc8d0142bd2198822cc3f7d4aa1cf9a (diff)
ALTQ base modifications to the kernel.
- ALTQ introduces a set of new queue macros that coexist with the traditional IF_XXX macros. - "struct ifaltq" replaces "struct ifqueue" in "struct ifnet". - assign cdev major 74 for i386 and 54 for alpha as ALTQ control interface.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_input.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index c57dba67acc..e2957ae31df 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_input.c,v 1.87 2001/06/26 18:17:54 deraadt Exp $ */
+/* $OpenBSD: ip_input.c,v 1.88 2001/06/27 05:50:07 kjc Exp $ */
/* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */
/*
@@ -354,6 +354,12 @@ ipv4_input(m)
ipstat.ips_inhwcsum++;
}
+#ifdef ALTQ
+ if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0)
+ /* packet is dropped by traffic conditioner */
+ return;
+#endif
+
/*
* Convert fields to host representation.
*/