fix compile warnings for gcc 6.2.0

[open-ath9k-htc-firmware.git] / target_firmware / wlan / ratectrl.h

diff --git a/target_firmware/wlan/ratectrl.h b/target_firmware/wlan/ratectrl.h
index 87f9b1b55e3ca098fdec130f36b3104a8da63cc3..020d9df54d336648064bea1be3521503f20486e2 100755 (executable)
--- a/target_firmware/wlan/ratectrl.h
+++ b/target_firmware/wlan/ratectrl.h
@@ -1,9 +1,38 @@
 /*
- * Copyright (c) 2000-2002 Atheros Communications, Inc., All Rights Reserved
+ * Copyright (c) 2013 Qualcomm Atheros, Inc.
+ * All rights reserved.
  *
- * Definitions for core driver
- * This is a common header file for all platforms and operating systems.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *  * Neither the name of Qualcomm Atheros nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef _RATECTRL_H_
 #define _RATECTRL_H_
 
@@ -51,7 +80,6 @@ typedef u_int8_t        WLAN_PHY;
  * a null arg because we know it's not needed.
  */
 #define A_MS_TICKGET()  OS_GETUPTIME(NULL)
-#define A_MEM_ZERO(p,s) OS_MEMZERO(p,s)
 
 #define WLAN_PHY_OFDM   IEEE80211_T_OFDM
 #define WLAN_PHY_TURBO  IEEE80211_T_TURBO
@@ -89,10 +117,8 @@ enum {
 
 #ifdef MAGPIE_MERLIN  
 #define MAX_TX_RATE_TBL         46
-#define MAX_TX_RATE_PHY         48
 #else
 #define MAX_TX_RATE_TBL         54//46
-#define MAX_TX_RATE_PHY         56//48
 #endif
 
 /*
@@ -130,7 +156,6 @@ typedef struct phy_rate_ctrl {
 struct atheros_node {
        TX_RATE_CTRL txRateCtrl;    /* rate control state proper */
        A_UINT32 lastRateKbps;      /* last rate in Kb/s */
-       A_UINT32 htcap;            /* ht capabilites */
        A_UINT8 singleStream    :1,   /* When TRUE, only single stream Tx possible */
                stbc            :2;   /* Rx stbc capability */
 
@@ -259,4 +284,17 @@ struct fusion_rate_info {
 
 void ar5416AttachRateTables(struct atheros_softc *sc);
 
+void ath_rate_node_update(struct ath_softc_tgt *sc,
+                         struct ath_node_target *an,
+                         a_int32_t isnew,
+                         a_uint32_t capflag,
+                         struct ieee80211_rate *rs);
+
+
+void ath_rate_newstate(struct ath_softc_tgt *sc,
+                      struct ieee80211vap_target *vap,
+                      enum ieee80211_state state,
+                      a_uint32_t capflag,
+                      struct ieee80211_rate *rs);
+
 #endif /* _RATECTRL_H_ */