wifi: ieee80211: correctly mark FTM frames non-bufferable

[carl9170fw.git] / carlfw / include / carl9170.h

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 4b0738d651a3fd0bdc93552284c3ed4e63652b85..6e8a3e16b722c972da05af1ff6e5109cc4ea7b52 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __CARL9170FW_CARL9170_H
@@ -39,16 +38,13 @@ struct carl9170_bar_ctx {
        uint8_t ra[6];
        __le16 start_seq_num;
        __le16 control;
-       __le32 phy;
 };
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
        CARL9170_CAB_TRIGGER_EMPTY      = 0,
        CARL9170_CAB_TRIGGER_ARMED      = BIT(0),
        CARL9170_CAB_TRIGGER_DEFER      = BIT(1),
 };
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 enum carl9170_ep0_action {
        CARL9170_EP0_NO_ACTION          = 0,
@@ -69,6 +65,11 @@ enum carl9170_suspend_mode {
        CARL9170_AWAKE_HOST,
 };
 
+enum carl9170_phy_state {
+       CARL9170_PHY_OFF                = 0,
+       CARL9170_PHY_ON
+};
+
 typedef void (*fw_desc_callback_t)(void *, const bool);
 
 /*
@@ -78,7 +79,7 @@ typedef void (*fw_desc_callback_t)(void *, const bool);
 
 struct firmware_context_struct {
        /* timer / clocks */
-       unsigned int ticks_per_msec;
+       unsigned int ticks_per_usec;
        unsigned int counter;                   /* main() cycles */
 
        /* misc */
@@ -110,20 +111,14 @@ struct firmware_context_struct {
                /* rx filter */
                unsigned int rx_filter;
 
-               /* rx statistics */
-               unsigned int rx_total;
-               unsigned int rx_overruns;
-
                /* tx sequence control counters */
                unsigned int sequence[CARL9170_INTF_NUM];
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */
                struct dma_queue cab_queue[CARL9170_INTF_NUM];
                unsigned int cab_queue_len[CARL9170_INTF_NUM];
                unsigned int cab_flush_time;
                enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
                /* tx status */
                unsigned int tx_status_pending,
@@ -140,17 +135,10 @@ struct firmware_context_struct {
                /* BA(R) Request Handler */
                struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
                unsigned int ba_tail_idx,
-                            ba_head_idx;
+                            ba_head_idx,
+                            queued_ba;
 
-#ifdef CONFIG_CARL9170FW_WOL
-               struct {
-                       struct carl9170_wol_cmd cmd;
-                       unsigned int last_beacon;
-                       unsigned int lost_null;
-                       unsigned int last_null;
-                       bool wake_up;
-               } wol;
-#endif /* CONFIG_CARL9170FW_WOL */
+               unsigned int queued_bar;
        } wlan;
 
        struct {
@@ -196,10 +184,25 @@ struct firmware_context_struct {
                unsigned int frequency;
                unsigned int ht_settings;
 
+               enum carl9170_phy_state state;
                struct carl9170_psm psm;
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
        } phy;
 
+       unsigned int tally_clock;
+       struct carl9170_tally_rsp tally;
+       unsigned int tx_time;
+
+#ifdef CONFIG_CARL9170FW_WOL
+       struct {
+               struct carl9170_wol_cmd cmd;
+               unsigned int last_beacon;
+               unsigned int lost_null;
+               unsigned int last_null;
+               bool wake_up;
+       } wol;
+#endif /* CONFIG_CARL9170FW_WOL */
+
 #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
        struct carl9170_gpio cached_gpio_state;
 #endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */