diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /drivers/net/wireless/iwlwifi/mvm/time-event.c | |
| parent | cf84eb0b09c0f09b4c70a648b9dfeec78be61f07 (diff) | |
| parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/time-event.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/time-event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c index 50f3d7f560b..b4c2abaa297 100644 --- a/drivers/net/wireless/iwlwifi/mvm/time-event.c +++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c @@ -249,12 +249,12 @@ static bool iwl_mvm_time_event_response(struct iwl_notif_wait_data *notif_wait, container_of(notif_wait, struct iwl_mvm, notif_wait); struct iwl_mvm_time_event_data *te_data = data; struct iwl_time_event_resp *resp; - int resp_len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK; + int resp_len = iwl_rx_packet_payload_len(pkt); if (WARN_ON(pkt->hdr.cmd != TIME_EVENT_CMD)) return true; - if (WARN_ON_ONCE(resp_len != sizeof(pkt->hdr) + sizeof(*resp))) { + if (WARN_ON_ONCE(resp_len != sizeof(*resp))) { IWL_ERR(mvm, "Invalid TIME_EVENT_CMD response\n"); return true; } |