ath6kl: Bringing in the upstream version

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

Index: chromeos/drivers/ath6kl/include/common/epping_test.h
diff --git a/chromeos/drivers/ath6kl/include/epping_test.h b/chromeos/drivers/ath6kl/include/common/epping_test.h
similarity index 87%
rename from chromeos/drivers/ath6kl/include/epping_test.h
rename to chromeos/drivers/ath6kl/include/common/epping_test.h
index e76b6420758d9be4e052a99f8f156bdcbf269d69..f8aeb3f657ea0c7e68c98b66ca81a6a18006c8a1 100644
--- a/chromeos/drivers/ath6kl/include/epping_test.h
+++ b/chromeos/drivers/ath6kl/include/common/epping_test.h
@@ -1,15 +1,18 @@
 //------------------------------------------------------------------------------
-// <copyright file="epping_test.h" company="Atheros">
-//    Copyright (c) 2009 Atheros Corporation.  All rights reserved.
+// Copyright (c) 2009-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.
 //
 //
 //------------------------------------------------------------------------------
@@ -29,7 +32,9 @@
     /* alignment to 4-bytes */
 #define EPPING_ALIGNMENT_PAD  (((sizeof(HTC_FRAME_HDR) + 3) & (~0x3)) - sizeof(HTC_FRAME_HDR))
 
+#ifndef A_OFFSETOF
 #define A_OFFSETOF(type,field) (int)(&(((type *)NULL)->field))
+#endif
 
 #define EPPING_RSVD_FILL                  0xCC