ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/os/linux/include/wmi_filter_linux.h

Index: chromeos/drivers/ath6kl/os/linux/include/wmi_filter_linux.h
diff --git a/chromeos/drivers/ath6kl/os/linux/include/wmi_filter_linux.h b/chromeos/drivers/ath6kl/os/linux/include/wmi_filter_linux.h
index bc5a471811ed15ed03c51c318bb01e7382351539..77e4ec6fea3aa34e6324182a0c42825a49581b62 100644
--- a/chromeos/drivers/ath6kl/os/linux/include/wmi_filter_linux.h
+++ b/chromeos/drivers/ath6kl/os/linux/include/wmi_filter_linux.h
@@ -1,19 +1,25 @@
-/*
- * Copyright (c) 2008-2009 Atheros Communications Inc.
- * 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;
+//------------------------------------------------------------------------------
+// Copyright (c) 2004-2010 Atheros Communications Inc.
+// All rights reserved.
 //
-// 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.
+//
+//
+//
+// Author(s): ="Atheros"
+//------------------------------------------------------------------------------
 
 #ifndef _WMI_FILTER_LINUX_H_
 #define  _WMI_FILTER_LINUX_H_
@@ -58,11 +64,11 @@ A_UINT8 sioctl_filter[] = {
 (0),                                            /* SIOCGIWTHRSPY   0x8B13   */
 (INFRA_NETWORK | ADHOC_NETWORK | AP_NETWORK),   /* SIOCSIWAP       0x8B14   */
 (INFRA_NETWORK | ADHOC_NETWORK | AP_NETWORK),   /* SIOCGIWAP       0x8B15   */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+#if (WIRELESS_EXT >= 18)
 (INFRA_NETWORK | ADHOC_NETWORK),                /* SIOCSIWMLME     0X8B16   */
 #else
 (0),                                            /* Dummy           0        */
-#endif /* LINUX_VERSION_CODE */
+#endif /* WIRELESS_EXT */
 (0),                                            /* SIOCGIWAPLIST   0x8B17   */
 (INFRA_NETWORK | ADHOC_NETWORK),                /* SIOCSIWSCAN     0x8B18   */
 (INFRA_NETWORK | ADHOC_NETWORK),                /* SIOCGIWSCAN     0x8B19   */
@@ -162,7 +168,7 @@ A_UINT8 xioctl_filter[] = {
 (INFRA_NETWORK | ADHOC_NETWORK),                /* AR6000_XIOCTL_WMI_SET_ROAM_CTRL                 32   */
 (INFRA_NETWORK | ADHOC_NETWORK),                /* AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS         33   */
 (INFRA_NETWORK | ADHOC_NETWORK | AP_NETWORK),   /* AR6000_XIOCTRL_WMI_GET_POWER_MODE               34   */
-(INFRA_NETWORK | ADHOC_NETWORK),                /* AR6000_XIOCTRL_WMI_SET_WLAN_STATE               35   */
+(INFRA_NETWORK | ADHOC_NETWORK | AP_NETWORK),   /* AR6000_XIOCTRL_WMI_SET_WLAN_STATE               35   */
 (INFRA_NETWORK | ADHOC_NETWORK),                /* AR6000_XIOCTL_WMI_GET_ROAM_DATA                 36   */
 (0xFF),                                         /* AR6000_XIOCTL_WMI_SETRETRYLIMITS                37   */
 (0xFF),                                         /* AR6000_XIOCTL_TCMD_CONT_TX                      38   */
@@ -277,7 +283,11 @@ A_UINT8 xioctl_filter[] = {
 (INFRA_NETWORK | ADHOC_NETWORK),                /* AR6000_XIOCTL_WMI_GET_BTCOEX_GET_STATS          147  */
 (0xFF),                                         /* AR6000_XIOCTL_WMI_SET_QOS_SUPP                  148  */
 (0xFF),                                         /* AR6000_XIOCTL_GET_WLAN_SLEEP_STATE              149  */
-
+(0xFF),                                         /* AR6000_XIOCTL_SET_BT_HW_POWER_STATE             150  */
+(0xFF),                                         /* AR6000_XIOCTL_GET_BT_HW_POWER_STATE             151  */
+(0xFF),                                         /* AR6000_XIOCTL_ADD_AP_INTERFACE                  152  */
+(0xFF),                                         /* AR6000_XIOCTL_REMOVE_AP_INTERFACE               153  */
+(0xFF),                                         /* AR6000_XIOCTL_WMI_SET_TX_SGI_PARAM              154  */
 };
 
 #endif /*_WMI_FILTER_LINUX_H_*/