summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel
diff options
context:
space:
mode:
authorSebastien Roy <Sebastien.Roy@Sun.COM>2009-09-22 22:04:45 -0400
committerSebastien Roy <Sebastien.Roy@Sun.COM>2009-09-22 22:04:45 -0400
commit2b24ab6b3865caeede9eeb9db6b83e1d89dcd1ea (patch)
tree72c0d7d4e1c44843a86bab6e3ed6f82cfa7356af /usr/src/uts/intel
parent51fc88a818087605a0e5f11eddb8b66576f72c23 (diff)
downloadillumos-joyent-2b24ab6b3865caeede9eeb9db6b83e1d89dcd1ea.tar.gz
PSARC 2009/373 Clearview IP Tunneling
PSARC 2009/410 Datalink Administration from Non-Global Zones 6858533 Clearview IP Tunneling 4861777 *snoop* cannot snoop on tunnel interfaces 5010680 M_IOCTL interface between ip and tun is horribly wrong 5029727 tun prints bogus debug messages when receiving multicast packets on 6to4 tunnels 6835873 dlpi_walk() silently fails in an exclusive zone 4152864 must not allow two tunnels to have the same tsrc/tdst pair 6855902 link and flow kstats are too promiscuous 6218826 need to be able to tunnel into a zone 4505468 network interface names can confuse, lie, and deceive 4524756 tun_wproc() takes up too much stack 6417373 tun_wproc_mdata assertion failures 4627970 scalability problems with IP in IP tunnels 4674797 ifparse_ifspec() will not correctly parse ipv6 tunnels 6509231 dladm should show links in exclusive stack zone 4793233 tun driver should include addr in DL_PHYS_ADDR_ACK for non-zero lengths 6795831 ZONE_*_DATALINK syscalls should take datalink_id_t as argument 6791472 mac module doesn't allow MAC addresses < 6 bytes 6618091 Race condition trips ASSERT() in tun.c's SIOCSLIFNAME path 6837580 bogus mi_active check in mac_set_mtu() 6868083 libinetutil: ofmt_open()'s template argument should be const 6870313 libdladm: needless dladm_init_linkprop() in i_dladm_aggr_up() 6872221 panic in dls_devnet_close() if "mtu" property is being set 4289774 Change to the interface-id does not change IPv6 link-local address 6873561 unable to create links with 31 character link names 6874666 changing a link property can accidentally destroy it 6874682 removing a link attribute corrupts the attribute list 6875167 IPCL_ISV6 conn flag is set but never used 6881764 itp reference leak in ipsec_construct_inverse_acquire() 6881951 dladm delete-vlan can no longer delete persistent-only VLANs --HG-- rename : usr/src/uts/common/inet/tun.h => usr/src/uts/common/inet/iptun.h rename : usr/src/uts/common/inet/ip/tun.c => usr/src/uts/common/inet/iptun/iptun.c rename : usr/src/uts/intel/tun/Makefile => usr/src/uts/intel/iptun/Makefile rename : usr/src/uts/sparc/tun/Makefile => usr/src/uts/sparc/iptun/Makefile
Diffstat (limited to 'usr/src/uts/intel')
-rw-r--r--usr/src/uts/intel/Makefile.intel.shared9
-rw-r--r--usr/src/uts/intel/ia32/ml/modstubs.s10
-rw-r--r--usr/src/uts/intel/ip/ip.global-objs.debug645
-rw-r--r--usr/src/uts/intel/ip/ip.global-objs.obj645
-rw-r--r--usr/src/uts/intel/iptun/Makefile85
-rw-r--r--usr/src/uts/intel/iptunq/Makefile78
-rw-r--r--usr/src/uts/intel/mac_6to4/Makefile (renamed from usr/src/uts/intel/6to4tun/Makefile)28
-rw-r--r--usr/src/uts/intel/mac_ipv4/Makefile (renamed from usr/src/uts/intel/atun/Makefile)30
-rw-r--r--usr/src/uts/intel/mac_ipv6/Makefile (renamed from usr/src/uts/intel/tun/Makefile)45
-rw-r--r--usr/src/uts/intel/os/minor_perm1
-rw-r--r--usr/src/uts/intel/os/name_to_major2
-rw-r--r--usr/src/uts/intel/tun/tun.global-objs.debug6441
12 files changed, 235 insertions, 104 deletions
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index 3fc1411108..f7369b8f45 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -364,6 +364,8 @@ DRV_KMODS += qlt
DRV_KMODS += iscsit
DRV_KMODS += ncall nsctl sdbc nskern sv
DRV_KMODS += ii rdc rdcsrv rdcstub
+DRV_KMODS += iptun
+DRV_KMODS += iptunq
#
# Don't build some of these for OpenSolaris, since they will be
@@ -530,10 +532,10 @@ FS_KMODS += smbfs
#
# Streams Modules (/kernel/strmod):
#
-STRMOD_KMODS += 6to4tun atun bufmod connld dedump ldterm pckt pfmod pipemod
+STRMOD_KMODS += bufmod connld dedump ldterm pckt pfmod pipemod
STRMOD_KMODS += ptem redirmod rpcmod rlmod telmod timod
STRMOD_KMODS += spppasyn spppcomp
-STRMOD_KMODS += tirdwr ttcompat tun
+STRMOD_KMODS += tirdwr ttcompat
STRMOD_KMODS += usbkbm
STRMOD_KMODS += usbms
STRMOD_KMODS += usb_ah
@@ -717,7 +719,10 @@ PCBE_KMODS += p123_pcbe p4_pcbe opteron_pcbe core_pcbe
#
# MAC-Type Plugin Modules (/kernel/mac)
#
+MAC_KMODS += mac_6to4
MAC_KMODS += mac_ether
+MAC_KMODS += mac_ipv4
+MAC_KMODS += mac_ipv6
MAC_KMODS += mac_wifi
MAC_KMODS += mac_ib
diff --git a/usr/src/uts/intel/ia32/ml/modstubs.s b/usr/src/uts/intel/ia32/ml/modstubs.s
index de2ff15c79..6de9fe1c3f 100644
--- a/usr/src/uts/intel/ia32/ml/modstubs.s
+++ b/usr/src/uts/intel/ia32/ml/modstubs.s
@@ -1289,6 +1289,16 @@ fcnname/**/_info: \
END_MODULE(softmac);
#endif
+#ifndef IPTUN_MODULE
+ MODULE(iptun,drv);
+ STUB(iptun, iptun_create, nomod_einval);
+ STUB(iptun, iptun_delete, nomod_einval);
+ STUB(iptun, iptun_set_policy, nomod_void) ;
+ STUB(iptun, iptun_set_g_q, nomod_einval);
+ STUB(iptun, iptun_clear_g_q, nomod_void);
+ END_MODULE(iptun);
+#endif
+
/*
* Stubs for kssl, the kernel SSL proxy
*/
diff --git a/usr/src/uts/intel/ip/ip.global-objs.debug64 b/usr/src/uts/intel/ip/ip.global-objs.debug64
index 931dfb7f5a..ff276921f7 100644
--- a/usr/src/uts/intel/ip/ip.global-objs.debug64
+++ b/usr/src/uts/intel/ip/ip.global-objs.debug64
@@ -150,6 +150,7 @@ ipcl_conn_hash_maxsize
ipcl_conn_hash_memfactor
ipcl_conn_hash_size
ipcl_debug_level
+ipcl_iptun_fanout_size
ipcl_raw_fanout_size
ipcl_udp_fanout_size
ipif_loopback_name
@@ -172,6 +173,10 @@ ipsec_sel_cache
ipsec_spd_hashsize
ipsec_weird_null_inbound_policy
ipsechw_debug
+iptunq_info
+iptunq_modinfo
+iptunq_rinit
+iptunq_winit
ipv4_forward_suffix
ipv4info
ipv6_all_hosts_mcast
diff --git a/usr/src/uts/intel/ip/ip.global-objs.obj64 b/usr/src/uts/intel/ip/ip.global-objs.obj64
index 776ef1fbf8..3bed15beb2 100644
--- a/usr/src/uts/intel/ip/ip.global-objs.obj64
+++ b/usr/src/uts/intel/ip/ip.global-objs.obj64
@@ -149,6 +149,7 @@ ipcl_bind_fanout_size
ipcl_conn_hash_maxsize
ipcl_conn_hash_memfactor
ipcl_conn_hash_size
+ipcl_iptun_fanout_size
ipcl_raw_fanout_size
ipcl_udp_fanout_size
ipif_loopback_name
@@ -170,6 +171,10 @@ ipsec_policy_failure_msgs
ipsec_sel_cache
ipsec_spd_hashsize
ipsec_weird_null_inbound_policy
+iptunq_info
+iptunq_modinfo
+iptunq_rinit
+iptunq_winit
ipv4_forward_suffix
ipv4info
ipv6_all_hosts_mcast
diff --git a/usr/src/uts/intel/iptun/Makefile b/usr/src/uts/intel/iptun/Makefile
new file mode 100644
index 0000000000..6fc2289eaa
--- /dev/null
+++ b/usr/src/uts/intel/iptun/Makefile
@@ -0,0 +1,85 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE = ../..
+
+#
+# Define the module and object file sets.
+#
+MODULE = iptun
+OBJECTS = $(IPTUN_OBJS:%=$(OBJS_DIR)/%)
+LINTS = $(IPTUN_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR = $(UTSBASE)/common/inet/iptun
+
+#
+# Include common rules.
+#
+include $(UTSBASE)/intel/Makefile.intel
+
+#
+# Define targets
+#
+ALL_TARGET = $(BINARY) $(SRC_CONFILE)
+LINT_TARGET = $(MODULE).lint
+INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+#
+# Overrides
+#
+CFLAGS += $(CCVERBOSE)
+LDFLAGS += -dy -Ndrv/dld -Nmisc/dls -Nmisc/mac -Ndrv/ip
+
+LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
+
+#
+# Default build targets.
+#
+.KEEP_STATE:
+
+def: $(DEF_DEPS)
+
+all: $(ALL_DEPS)
+
+clean: $(CLEAN_DEPS)
+
+clobber: $(CLOBBER_DEPS)
+
+lint: $(LINT_DEPS)
+
+modlintlib: $(MODLINTLIB_DEPS)
+
+clean.lint: $(CLEAN_LINT_DEPS)
+
+install: $(INSTALL_DEPS)
+
+#
+# Include common targets.
+#
+include $(UTSBASE)/intel/Makefile.targ
diff --git a/usr/src/uts/intel/iptunq/Makefile b/usr/src/uts/intel/iptunq/Makefile
new file mode 100644
index 0000000000..ffefbaeb29
--- /dev/null
+++ b/usr/src/uts/intel/iptunq/Makefile
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE = ../..
+
+#
+# Define the module and object file sets.
+#
+MODULE = iptunq
+OBJECTS = $(IPTUNQ_OBJS:%=$(OBJS_DIR)/%)
+LINTS = $(IPTUNQ_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR = $(UTSBASE)/common/inet/iptun
+
+#
+# Include common rules.
+#
+include $(UTSBASE)/intel/Makefile.intel
+
+#
+# Define targets
+#
+ALL_TARGET = $(BINARY) $(SRC_CONFFILE)
+LINT_TARGET = $(MODULE).lint
+INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
+
+LDFLAGS += -dy -Ndrv/ip
+
+#
+# Default build targets.
+#
+.KEEP_STATE:
+
+def: $(DEF_DEPS)
+
+all: $(ALL_DEPS)
+
+clean: $(CLEAN_DEPS)
+
+clobber: $(CLOBBER_DEPS)
+
+lint: $(LINT_DEPS)
+
+modlintlib: $(MODLINTLIB_DEPS)
+
+clean.lint: $(CLEAN_LINT_DEPS)
+
+install: $(INSTALL_DEPS)
+
+#
+# Include common targets.
+#
+include $(UTSBASE)/intel/Makefile.targ
diff --git a/usr/src/uts/intel/6to4tun/Makefile b/usr/src/uts/intel/mac_6to4/Makefile
index 72c21e40fa..ffb0800d13 100644
--- a/usr/src/uts/intel/6to4tun/Makefile
+++ b/usr/src/uts/intel/mac_6to4/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,13 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
#
-# This makefile drives the production of the 6to4 tunneling streams
+# This makefile drives the production of the mac_6to4 plugin
# kernel module.
#
-# intel implementation architecture dependent
-#
#
# Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -39,10 +35,10 @@ UTSBASE = ../..
#
# Define the module and object file sets.
#
-MODULE = 6to4tun
-OBJECTS = $(6TO4TUN_OBJS:%=$(OBJS_DIR)/%)
-LINTS = $(6TO4TUN_OBJS:%.o=$(LINTS_DIR)/%.ln)
-ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE)
+MODULE = mac_6to4
+OBJECTS = $(MAC_6TO4_OBJS:%=$(OBJS_DIR)/%)
+LINTS = $(MAC_6TO4_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE = $(ROOT_MAC_DIR)/$(MODULE)
#
# Include common rules.
@@ -57,9 +53,13 @@ LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
-# depends on tun
+# Overrides.
#
-LDFLAGS += -dy -Nstrmod/tun
+CFLAGS += $(CCVERBOSE)
+LDFLAGS += -dy -Nmisc/mac -Nmac/mac_ipv4
+
+LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
#
# Default build targets.
diff --git a/usr/src/uts/intel/atun/Makefile b/usr/src/uts/intel/mac_ipv4/Makefile
index b9eae50300..578a504341 100644
--- a/usr/src/uts/intel/atun/Makefile
+++ b/usr/src/uts/intel/mac_ipv4/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
# CDDL HEADER END
#
#
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# This makefile drives the production of the automatic tunneling streams
+# This makefile drives the production of the mac_ipv4 plugin
# kernel module.
#
-# intel implementation architecture dependent
-#
#
# Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -40,10 +34,10 @@ UTSBASE = ../..
#
# Define the module and object file sets.
#
-MODULE = atun
-OBJECTS = $(ATUN_OBJS:%=$(OBJS_DIR)/%)
-LINTS = $(ATUN_OBJS:%.o=$(LINTS_DIR)/%.ln)
-ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE)
+MODULE = mac_ipv4
+OBJECTS = $(MAC_IPV4_OBJS:%=$(OBJS_DIR)/%)
+LINTS = $(MAC_IPV4_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE = $(ROOT_MAC_DIR)/$(MODULE)
#
# Include common rules.
@@ -58,9 +52,13 @@ LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
-# depends on tun
+# Overrides.
#
-LDFLAGS += -dy -Nstrmod/tun
+CFLAGS += $(CCVERBOSE)
+LDFLAGS += -dy -Nmisc/mac
+
+LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
#
# Default build targets.
diff --git a/usr/src/uts/intel/tun/Makefile b/usr/src/uts/intel/mac_ipv6/Makefile
index ce6033c43d..4d0983e15c 100644
--- a/usr/src/uts/intel/tun/Makefile
+++ b/usr/src/uts/intel/mac_ipv6/Makefile
@@ -19,17 +19,12 @@
# CDDL HEADER END
#
#
-# uts/intel/tun/Makefile
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# This makefile drives the production of the configured tunneling
-# streams kernel module.
#
-# intel architecture dependent
+# This makefile drives the production of the mac_ipv6 plugin
+# kernel module.
#
#
@@ -40,17 +35,10 @@ UTSBASE = ../..
#
# Define the module and object file sets.
#
-MODULE = tun
-OBJECTS = $(TUN_OBJS:%=$(OBJS_DIR)/%)
-LINTS = $(TUN_OBJS:%.o=$(LINTS_DIR)/%.ln)
-ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE)
-
-#
-# Extra for $(MODULE).check target
-#
-# Need to remove ipddi.o since it has non-static defines for _init etc.
-IP_CHECK_OBJS = $(IP_OBJS:ipddi.o=ip.o)
-EXTRA_CHECK_OBJS = $(IP_CHECK_OBJS:%=../ip/$(OBJS_DIR)/%)
+MODULE = mac_ipv6
+OBJECTS = $(MAC_IPV6_OBJS:%=$(OBJS_DIR)/%)
+LINTS = $(MAC_IPV6_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE = $(ROOT_MAC_DIR)/$(MODULE)
#
# Include common rules.
@@ -65,18 +53,13 @@ LINT_TARGET = $(MODULE).lint
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
#
-# depends on ip and ip6
+# Overrides.
#
-LDFLAGS += -dy -Ndrv/ip -Ndrv/ip6
+CFLAGS += $(CCVERBOSE)
+LDFLAGS += -dy -Nmisc/mac -Nmac/mac_ipv4
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
#
# Default build targets.
@@ -85,11 +68,11 @@ LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
def: $(DEF_DEPS)
-all: $(ALL_DEPS) $(SISCHECK_DEPS)
+all: $(ALL_DEPS)
-clean: $(CLEAN_DEPS) $(SISCLEAN_DEPS)
+clean: $(CLEAN_DEPS)
-clobber: $(CLOBBER_DEPS) $(SISCLEAN_DEPS)
+clobber: $(CLOBBER_DEPS)
lint: $(LINT_DEPS)
@@ -97,7 +80,7 @@ modlintlib: $(MODLINTLIB_DEPS)
clean.lint: $(CLEAN_LINT_DEPS)
-install: $(INSTALL_DEPS) $(SISCHECK_DEPS)
+install: $(INSTALL_DEPS)
#
# Include common targets.
diff --git a/usr/src/uts/intel/os/minor_perm b/usr/src/uts/intel/os/minor_perm
index 3e6df05c75..0919c33000 100644
--- a/usr/src/uts/intel/os/minor_perm
+++ b/usr/src/uts/intel/os/minor_perm
@@ -198,6 +198,7 @@ domcaps:* 0444 root sys
evtchn:* 0666 root sys
privcmd:* 0666 root sys
xenbus:* 0666 root sys
+iptunq:* 0640 root sys
fm:* 0644 root sys
amd_iommu:* 0644 root sys
xpvtap:* 0666 root sys
diff --git a/usr/src/uts/intel/os/name_to_major b/usr/src/uts/intel/os/name_to_major
index 83e7825871..84fc215d10 100644
--- a/usr/src/uts/intel/os/name_to_major
+++ b/usr/src/uts/intel/os/name_to_major
@@ -157,3 +157,5 @@ intel_nhm 262
simnet 263
acpinex 264
bridge 265
+iptun 266
+iptunq 267
diff --git a/usr/src/uts/intel/tun/tun.global-objs.debug64 b/usr/src/uts/intel/tun/tun.global-objs.debug64
deleted file mode 100644
index 99d06ddee0..0000000000
--- a/usr/src/uts/intel/tun/tun.global-objs.debug64
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-
-IP6_MAJ
-IP_MAJ
-bindack
-info
-infoack
-modlinkage
-modlstrmod
-tun_debug
-tun_do_fastpath
-tun_fmodsw
-tun_limit_init_upper_v4
-tun_limit_init_upper_v6
-tuninfo
-tunrinit
-tunwinit