ath6kl: Bringing in the upstream version

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

Index: chromeos/drivers/ath6kl/os/linux/include/athdrv_linux.h
diff --git a/chromeos/drivers/ath6kl/os/linux/include/athdrv_linux.h b/chromeos/drivers/ath6kl/os/linux/include/athdrv_linux.h
index 0fcef6dc01fdd5c911a33a2df2eeb6451f24992f..53bbb4837d30baac70f4fd47eff318e0b877d11c 100644
--- a/chromeos/drivers/ath6kl/os/linux/include/athdrv_linux.h
+++ b/chromeos/drivers/ath6kl/os/linux/include/athdrv_linux.h
@@ -1,21 +1,25 @@
-/*
- * Copyright (c) 2004-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 _ATHDRV_LINUX_H
 #define _ATHDRV_LINUX_H
@@ -944,6 +948,12 @@ typedef enum {
 
 #define AR6000_XIOCTL_AP_SET_11BG_RATESET           135
 
+/*
+ * arguments:
+ *   WMI_AP_PS_CMD apPsCmd
+ * uses: WMI_AP_PS_CMDID
+ */
+
 #define AR6000_XIOCTL_WMI_SET_AP_PS                 136
 
 #define AR6000_XIOCTL_WMI_MCAST_FILTER              137
@@ -977,11 +987,16 @@ typedef enum {
 
 #define AR6000_XIOCTL_GET_WLAN_SLEEP_STATE              149
 
-/*
- * arguments:
- *   WMI_AP_PS_CMD apPsCmd
- * uses: WMI_AP_PS_CMDID
- */
+#define AR6000_XIOCTL_SET_BT_HW_POWER_STATE             150 
+
+#define AR6000_XIOCTL_GET_BT_HW_POWER_STATE             151
+
+#define AR6000_XIOCTL_ADD_AP_INTERFACE                  152
+
+#define AR6000_XIOCTL_REMOVE_AP_INTERFACE               153
+
+#define AR6000_XIOCTL_WMI_SET_TX_SGI_PARAM              154
+
 
 /* used by AR6000_IOCTL_WMI_GETREV */
 struct ar6000_version {