summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/rx.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-02-12 15:24:14 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-02-12 15:24:14 -0500
commit841577c3d33b8a2bff66d1b506d8198b25900bde (patch)
tree444ca28c7b9ed796d3949f019ae97d2c8ed5bd28 /drivers/net/wireless/iwlwifi/mvm/rx.c
parente9c653167710e5624c5576ee7d657c6b86878caf (diff)
parent63c361f5114d81db789f8f5671c76c228c35b021 (diff)
downloadop-kernel-dev-841577c3d33b8a2bff66d1b506d8198b25900bde.zip
op-kernel-dev-841577c3d33b8a2bff66d1b506d8198b25900bde.tar.gz
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/rx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/iwlwifi/mvm/rx.c
index ef727df..fa3c139 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rx.c
@@ -358,10 +358,10 @@ int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
rx_status.flag |= RX_FLAG_40MHZ;
break;
case RATE_MCS_CHAN_WIDTH_80:
- rx_status.flag |= RX_FLAG_80MHZ;
+ rx_status.vht_flag |= RX_VHT_FLAG_80MHZ;
break;
case RATE_MCS_CHAN_WIDTH_160:
- rx_status.flag |= RX_FLAG_160MHZ;
+ rx_status.vht_flag |= RX_VHT_FLAG_160MHZ;
break;
}
if (rate_n_flags & RATE_MCS_SGI_MSK)
OpenPOWER on IntegriCloud