Merge tag 'mac80211-next-for-davem-2015-08-14' into next

[linux-drm-fsl-dcu.git] / drivers / net / wireless / iwlwifi / mvm / mvm.h

diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 2b2e2996ccb9cbd331cd50f8c28c6f7d72b8ea7e..58544f20ddada65e504db820c8edb2752bf5b24c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -563,6 +563,7 @@ struct iwl_mvm {
        const struct iwl_cfg *cfg;
        struct iwl_phy_db *phy_db;
        struct ieee80211_hw *hw;
+       struct napi_struct *napi;
 
        /* for protecting access to iwl_mvm */
        struct mutex mutex;