Move the *intrq variables into net/intrq.c and unconditionally

include this in all kernels.  Declare some const *intrq_present
variables that can be checked by a module prior to using *intrq
to queue data.

Make the if_tun module capable of processing atm, ip, ip6, ipx,
natm and netatalk packets when TUNSIFHEAD is ioctl()d on.

Review not required by: freebsd-hackers

1 files changed, 60 insertions, 0 deletions

diff --git a/sys/net/intrq.c b/sys/net/intrq.c
new file mode 100644
index 0000000..df6e45c
--- /dev/null
+++ b/sys/net/intrq.c
@@ -0,0 +1,60 @@
+/*-
+ * Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/intrq.h>
+
+/*
+ * If the appropriate intrq_present variable is zero, don't use
+ * the queue (as it'll never get processed).
+ * When defined, each of the network stacks declares their own
+ * *intrq_present variable to be non-zero.
+ */
+
+const int	atintrq1_present;
+const int	atintrq2_present;
+const int	atmintrq_present;
+const int	ipintrq_present;
+const int	ip6intrq_present;
+const int	ipxintrq_present;
+const int	natmintrq_present;
+const int	nsintrq_present;
+
+struct ifqueue	atintrq1;
+struct ifqueue	atintrq2;
+struct ifqueue	atm_intrq;
+struct ifqueue	ipintrq;
+struct ifqueue	ip6intrq;
+struct ifqueue	ipxintrq;
+struct ifqueue	natmintrq;
+struct ifqueue	nsintrq;