--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/pkgdefs/SUNWatheros/depend	Mon Feb 13 19:35:00 2006 -0800
@@ -0,0 +1,53 @@
+#
+# 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.
+#
+# 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 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+

--- a/usr/src/pkgdefs/Makefile	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/pkgdefs/Makefile	Mon Feb 13 19:35:00 2006 -0800
@@ -98,6 +98,7 @@
         SUNWagp \
         SUNWagph \
 	SUNWamr \
+	SUNWatheros \
 	SUNWcakr.i \
 	SUNWcar.i  \
 	SUNWcpc.i \
@@ -115,7 +116,6 @@
 	SUNWrtls \
 	SUNWsi3124 \
 	SUNWvia823x \
-	SUNWatheros \
 	SUNWmv88sx
 
 i386_XMODS= \

--- a/usr/src/pkgdefs/SUNWatheros/Makefile	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/pkgdefs/SUNWatheros/Makefile	Mon Feb 13 19:35:00 2006 -0800
@@ -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.
@@ -19,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,9 +28,11 @@
 
 include ../Makefile.com
 
+DATAFILES += depend
+
 .KEEP_STATE:
 
-all: $(FILES) depend postinstall postremove
+all: $(FILES) postinstall postremove
 install: all pkg
 
 include ../Makefile.targ

--- a/usr/src/pkgdefs/SUNWatheros/depend	Mon Feb 13 15:00:16 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# 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.
-#
-# 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 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-

--- a/usr/src/pkgdefs/SUNWatheros/pkginfo.tmpl	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/pkgdefs/SUNWatheros/pkginfo.tmpl	Mon Feb 13 19:35:00 2006 -0800
@@ -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.
@@ -19,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"

--- a/usr/src/pkgdefs/SUNWatheros/postinstall	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/pkgdefs/SUNWatheros/postinstall	Mon Feb 13 19:35:00 2006 -0800
@@ -3,9 +3,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,8 +19,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,31 +42,34 @@
 
 check_add_drv()
 {
-	CMD=$*
-	shift
+	CMD="add_drv"
 
 	ALIAS=""
-	CLASS=""
-	MPERM=""
-	ALIASDIR=${BASEDIR}/etc/driver_aliases
-	CLASSDIR=${BASEDIR}/etc/driver_classes
-	MPERMDIR=${BASEDIR}/etc/minor_perm
-	while getopts i:c:m opt 2>/dev/null; do
+	ALIASDIR="${BASEDIR}"/etc/driver_aliases
+	while getopts i:b: opt 2>/dev/null; do
 		case "$opt" in
-			i)	ALIAS=`echo ${OPTARG} | /usr/bin/sed -e "s/'//g"`
-				;;
-			c)	CLASS=${OPTARG}
-				;;
-			m)	MPERM=${OPTARG}
-				;;
+		i)	CMD="${CMD} -i ${OPTARG}"
+			ALIAS=`echo ${OPTARG} | /usr/bin/sed -e "s/'//g"`
+			;;
+		b)	if [ "${OPTARG}" != "/" ]; then
+				# On a client
+				# modify the sytem files and touch
+				# /reconfigure for reconfigure reboot
+				CMD="${CMD} -b \"${OPTARG}\""
+			fi
+			;;
+		\?)	echo "check_add_drv(): Unknown option $opt"
+			return
+			;;
 		esac
 	done
 	shift `/usr/bin/expr ${OPTIND} - 1`
 	DRIVER=$1
+	CMD="${CMD} ${DRIVER}"
 
 	# Make sure add_drv has not been previously executed
 	# before attempting to add the driver
-	/usr/bin/egrep -s "^${DRIVER}[ 	]" $BASEDIR/etc/name_to_major
+	/usr/bin/egrep -s "^${DRIVER}[ 	]" "$BASEDIR"/etc/name_to_major
 
 	if [ $? -ne 0 ]; then
 		eval ${CMD}
@@ -84,57 +87,7 @@
 				fi
 			done
 		fi
-
-		if [ -n "${CLASS}" ]; then
-			/usr/bin/egrep -s "^${DRIVER}[ 	]+${CLASS}" ${CLASSDIR}
-			if [ $? -ne 0 ]; then
-				echo "${DRIVER}\t${CLASS}" >> ${CLASSDIR}
-			fi
-		fi
-
-		if [ -n "${MPERM}" ]; then
-			/usr/bin/egrep -s "^${DRIVER}:" ${MPERMDIR}
-			if [ $? -ne 0 ]; then
-				echo "${DRIVER}:${PERM}" >> ${MPERMDIR}
-			fi
-		fi
 	fi
 }
 
-# Is the hardware there?
-hw_exists=0
-CLEANALIAS=`echo ${DRVALIAS} | /usr/bin/sed -e 's/\"//g'`
-for i in ${CLEANALIAS}
-do
-	prtconf -v | /usr/bin/egrep -s $i
-	if [ $? -eq 0 ]
-	then
-		hw_exists=1
-	fi
-done
-
-# Only attempt to attach the driver on a running
-# system with the hardware present
-if [ "$BASEDIR" = "/" ]
-then
-	case ${hw_exists} in
-		# On a running system with no hardware
-		# modify the system files only
-		0)	ADD_DRV="add_drv -n"
-			;;
-		# On a running system with hardware
-		# modify the system files and attach the driver
-		1)	ADD_DRV="add_drv"
-			;;
-	esac
-else
-	# On a client
-	# modify the sytem files and touch /reconfigure
-	# for reconfigure reboot
-	ADD_DRV="add_drv -b ${BASEDIR}"
-fi
-
-ARCH=`uname -p`
-if [ ${ARCH} = "i386" ]; then
-	check_add_drv ${ADD_DRV} -i "'${DRVALIAS}'" ${DRV}
-fi
+check_add_drv -b "${BASEDIR}" -i "'${DRVALIAS}'" ${DRV}

--- a/usr/src/pkgdefs/SUNWatheros/postremove	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/pkgdefs/SUNWatheros/postremove	Mon Feb 13 19:35:00 2006 -0800
@@ -3,9 +3,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,8 +19,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"

--- a/usr/src/pkgdefs/SUNWatheros/prototype_i386	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/pkgdefs/SUNWatheros/prototype_i386	Mon Feb 13 19:35:00 2006 -0800
@@ -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.
@@ -19,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"

--- a/usr/src/uts/common/io/ath/ath_ieee80211.c	Mon Feb 13 15:00:16 2006 -0800
+++ b/usr/src/uts/common/io/ath/ath_ieee80211.c	Mon Feb 13 19:35:00 2006 -0800
@@ -1,10 +1,8 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
  * All rights reserved.
@@ -80,6 +78,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/signal.h>