diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-08-18 08:44:22 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-08-18 08:44:22 +0300 |
| commit | 15f6d96ded057b898312b0a088a964d585a779b1 (patch) | |
| tree | 611abf2de01ce27690360588d69cc11071ea774a /drivers/net/wireless/iwlwifi/dvm/dev.h | |
| parent | 94e92a7bff2317bedd67ed7c46ac63e9affb7a99 (diff) | |
| parent | 8f9c98df949333f08b74e5df1caacf7e2c5e8552 (diff) | |
| download | blackbird-op-linux-15f6d96ded057b898312b0a088a964d585a779b1.tar.gz blackbird-op-linux-15f6d96ded057b898312b0a088a964d585a779b1.zip | |
Merge tag 'mac80211-next-for-davem-2015-08-14' mac80211-next.git
iwlwifi needs new mac80211 patches so merge mac80211-next.git to
wireless-drivers-next.git.
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/dev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h index 1f51757f4a93..0ba3e56d6015 100644 --- a/drivers/net/wireless/iwlwifi/dvm/dev.h +++ b/drivers/net/wireless/iwlwifi/dvm/dev.h @@ -669,6 +669,8 @@ struct iwl_priv { /* ieee device used by generic ieee processing code */ struct ieee80211_hw *hw; + struct napi_struct *napi; + struct list_head calib_results; struct workqueue_struct *workqueue; |
