Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-core.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index fc096b929ee39a153fe6ea57ac7a0ea28a4b1bca..7ff9ffb2b7026c2280e7623eaa77d95f4ad89e2d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -209,6 +209,8 @@ struct iwl_mod_params {
  * @ucode_api_max: Highest version of uCode API supported by driver.
  * @ucode_api_min: Lowest version of uCode API supported by driver.
  * @pa_type: used by 6000 series only to identify the type of Power Amplifier
+ * @max_ll_items: max number of OTP blocks
+ * @shadow_ram_support: shadow support for OTP memory
  *
  * We enable the driver to be backward compatible wrt API version. The
  * driver specifies which APIs it supports (with @ucode_api_max being the
@@ -247,6 +249,10 @@ struct iwl_cfg {
        bool need_pll_cfg;
        bool use_isr_legacy;
        enum iwl_pa_type pa_type;
+       const u16 max_ll_items;
+       const bool shadow_ram_support;
+       const bool ht_greenfield_support;
+       const bool broken_powersave;
 };
 
 /***************************
@@ -277,8 +283,7 @@ int iwl_set_decrypted_flag(struct iwl_priv *priv,
 void iwl_irq_handle_error(struct iwl_priv *priv);
 void iwl_configure_filter(struct ieee80211_hw *hw,
                          unsigned int changed_flags,
-                         unsigned int *total_flags,
-                         int mc_count, struct dev_addr_list *mc_list);
+                         unsigned int *total_flags, u64 multicast);
 int iwl_hw_nic_init(struct iwl_priv *priv);
 int iwl_setup_mac(struct iwl_priv *priv);
 int iwl_set_hw_params(struct iwl_priv *priv);
@@ -314,6 +319,8 @@ const char *get_mgmt_string(int cmd);
 const char *get_ctrl_string(int cmd);
 void iwl_clear_tx_stats(struct iwl_priv *priv);
 void iwl_clear_rx_stats(struct iwl_priv *priv);
+void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc,
+                     u16 len);
 #else
 static inline int iwl_alloc_traffic_mem(struct iwl_priv *priv)
 {
@@ -333,9 +340,22 @@ static inline void iwl_dbg_log_rx_data_frame(struct iwl_priv *priv,
                      u16 length, struct ieee80211_hdr *header)
 {
 }
+static inline void iwl_update_stats(struct iwl_priv *priv, bool is_tx,
+                                   __le16 fc, u16 len)
+{
+       struct traffic_stats    *stats;
+
+       if (is_tx)
+               stats = &priv->tx_stats;
+       else
+               stats = &priv->rx_stats;
+
+       if (ieee80211_is_data(fc)) {
+               /* data */
+               stats->data_bytes += len;
+       }
+}
 #endif
-void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc,
-                     u16 len);
 /*****************************************************
  * RX handlers.
  * **************************************************/
@@ -404,6 +424,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force);
 void iwl_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags,
                              struct ieee80211_tx_info *info);
 int iwl_hwrate_to_plcp_idx(u32 rate_n_flags);
+int iwl_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band);
 
 u8 iwl_rate_get_lowest_plcp(struct iwl_priv *priv);
 
@@ -547,8 +568,6 @@ void iwlcore_free_geos(struct iwl_priv *priv);
 #define STATUS_POWER_PMI       16
 #define STATUS_FW_ERROR                17
 #define STATUS_MODE_PENDING    18
-#define STATUS_INIT_UCODE_ALIVE        19
-#define STATUS_RT_UCODE_ALIVE  20
 
 
 static inline int iwl_is_ready(struct iwl_priv *priv)