ath6kl: Bringing in the upstream version

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

Index: chromeos/drivers/ath6kl/include/common/htc.h
diff --git a/chromeos/drivers/ath6kl/include/htc.h b/chromeos/drivers/ath6kl/include/common/htc.h
similarity index 90%
rename from chromeos/drivers/ath6kl/include/htc.h
rename to chromeos/drivers/ath6kl/include/common/htc.h
index 515c8ec62bdf2593d3b5a08ff4abb0a0810b9561..f96cf7db7e06457bbe3547c7d17d1c97d0426e14 100644
--- a/chromeos/drivers/ath6kl/include/htc.h
+++ b/chromeos/drivers/ath6kl/include/common/htc.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="htc.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.
 //
 //
 //------------------------------------------------------------------------------
@@ -24,7 +28,7 @@
 #include "athstartpack.h"
 #endif
 
-#define A_OFFSETOF(type,field) (int)(&(((type *)NULL)->field))
+#define A_OFFSETOF(type,field) (unsigned long)(&(((type *)NULL)->field))
 
 #define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \
         (((A_UINT16)(((A_UINT8 *)(p))[(highbyte)])) << 8 | (A_UINT16)(((A_UINT8 *)(p))[(lowbyte)]))