summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenjiro Cho <kjc@cvs.openbsd.org>2002-03-01 05:06:25 +0000
committerKenjiro Cho <kjc@cvs.openbsd.org>2002-03-01 05:06:25 +0000
commit6c107852a90d074f6b37113f86c1a71f66c6dc3a (patch)
tree00dd0705fff7965777f83a84ca711a7163b8ab98
parent96a20df8c7cdd3076371f3e92c8a12060894e02b (diff)
sync with KAME
move the function prototype of altq_etherclassify() from netinet/if_ether.h to altq/if_altq.h.
-rw-r--r--sys/altq/if_altq.h3
-rw-r--r--sys/netinet/if_ether.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/altq/if_altq.h b/sys/altq/if_altq.h
index 2b9c7d2ef02..055e956e454 100644
--- a/sys/altq/if_altq.h
+++ b/sys/altq/if_altq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_altq.h,v 1.1 2001/06/27 05:28:36 kjc Exp $ */
+/* $OpenBSD: if_altq.h,v 1.2 2002/03/01 05:06:24 kjc Exp $ */
/* $KAME: if_altq.h,v 1.6 2001/01/29 19:59:09 itojun Exp $ */
/*
@@ -160,6 +160,7 @@ extern int altq_enable __P((struct ifaltq *));
extern int altq_disable __P((struct ifaltq *));
extern struct mbuf *tbr_dequeue __P((struct ifaltq *, int));
extern int (*altq_input) __P((struct mbuf *, int));
+void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
#endif /* _KERNEL */
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 308effcfd9a..00120cda5e6 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.h,v 1.17 2001/06/27 06:07:47 kjc Exp $ */
+/* $OpenBSD: if_ether.h,v 1.18 2002/03/01 05:06:24 kjc Exp $ */
/* $NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $ */
/*
@@ -285,9 +285,6 @@ void revarprequest __P((struct ifnet *));
int revarpwhoarewe __P((struct ifnet *, struct in_addr *, struct in_addr *));
int revarpwhoami __P((struct in_addr *, struct ifnet *));
int db_show_arptab __P((void));
-#ifdef ALTQ
-void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
-#endif /* ALTQ */
#else