diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-16 21:54:17 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-16 21:54:17 +0400 |
| commit | 2b755bbd8198161416ce24e3358817d8ede93037 (patch) | |
| tree | 7b04bc63c08adb384a1fd4eb118f364c56aa4dab /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 608cfbe4abaf76e9d732efd7ed1cfa3998163d91 (diff) | |
| parent | cf38e4f756d6396657c76f72ef42b6f47c523f97 (diff) | |
| download | linux-2b755bbd8198161416ce24e3358817d8ede93037.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 40eb5e691475..c24d1d3d55f6 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -406,9 +406,8 @@ static bool iwl_resume_status_fn(struct iwl_notif_wait_data *notif_wait, { struct iwl_resume_data *resume_data = data; struct iwl_priv *priv = resume_data->priv; - u32 len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; - if (len - 4 != sizeof(*resume_data->cmd)) { + if (iwl_rx_packet_payload_len(pkt) != sizeof(*resume_data->cmd)) { IWL_ERR(priv, "rx wrong size data\n"); return true; } |