ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/include/athbtfilter.h

Index: chromeos/drivers/ath6kl/include/athbtfilter.h
diff --git a/chromeos/drivers/ath6kl/include/athbtfilter.h b/chromeos/drivers/ath6kl/include/athbtfilter.h
index 7eb766120ee809ff65a980917b3ef697cd295b9b..dbe68bbb727c90fc2622a3d2bf7eb3e72c6bc93e 100644
--- a/chromeos/drivers/ath6kl/include/athbtfilter.h
+++ b/chromeos/drivers/ath6kl/include/athbtfilter.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="athbtfilter.h" company="Atheros">
-//    Copyright (c) 2007-2008 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2007-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.
 //
 //
 //------------------------------------------------------------------------------
@@ -61,7 +65,7 @@ typedef struct _ATHBT_FILTER_INSTANCE {
 #ifdef UNDER_CE
     WCHAR                       *pWlanAdapterName;  /* filled in by user */
 #else
-    A_CHAR                      *pWlanAdapterName;  /* filled in by user */
+    char                        *pWlanAdapterName;  /* filled in by user */
 #endif /* UNDER_CE */
     int                         FilterEnabled;      /* filtering is enabled */
     int                         Attached;           /* filter library is attached */
@@ -121,7 +125,7 @@ extern "C" {
 #endif
 
 /* API prototypes */
-int     AthBtFilter_Attach(ATH_BT_FILTER_INSTANCE *pInstance, A_UINT32 flags);
+int     AthBtFilter_Attach(ATH_BT_FILTER_INSTANCE *pInstance, unsigned int flags);
 void    AthBtFilter_Detach(ATH_BT_FILTER_INSTANCE *pInstance);
 
 #ifdef __cplusplus