ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/include/common/dset_internal.h

Index: chromeos/drivers/ath6kl/include/common/dset_internal.h
diff --git a/chromeos/drivers/ath6kl/include/dset_internal.h b/chromeos/drivers/ath6kl/include/common/dset_internal.h
similarity index 62%
rename from chromeos/drivers/ath6kl/include/dset_internal.h
rename to chromeos/drivers/ath6kl/include/common/dset_internal.h
index 474f3c273574b813b9bd419a6c2d3409d7b61bbc..2460f0ecf12bd6e85714d53db4f5113ce0489f3c 100644
--- a/chromeos/drivers/ath6kl/include/dset_internal.h
+++ b/chromeos/drivers/ath6kl/include/common/dset_internal.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="dset_internal.h" company="Atheros">
-//    Copyright (c) 2004-2007 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
 // 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 //
 //------------------------------------------------------------------------------
@@ -21,6 +25,10 @@
 #ifndef __DSET_INTERNAL_H__
 #define __DSET_INTERNAL_H__
 
+#ifndef ATH_TARGET
+#include "athstartpack.h"
+#endif
+
 /*
  * Internal dset definitions, common for DataSet layer.
  */
@@ -31,7 +39,7 @@
 
 /* Dataset descriptor */
 
-typedef struct dset_descriptor_s {
+typedef PREPACK struct dset_descriptor_s {
   struct dset_descriptor_s  *next;         /* List link. NULL only at the last
                                               descriptor */
   A_UINT16                   id;           /* Dset ID */
@@ -46,6 +54,10 @@ typedef struct dset_descriptor_s {
                                               needed for data_type. For
                                               example, pointer to patch
                                               Dataset descriptor for BPatch. */
-} dset_descriptor_t;
+} POSTPACK dset_descriptor_t;
+
+#ifndef ATH_TARGET
+#include "athendpack.h"
+#endif
 
 #endif /* __DSET_INTERNAL_H__ */