Merge tag 'iwlwifi-next-for-kalle-2017-11-29' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / drivers / net / wireless / intel / iwlwifi / mvm / tx.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index e359e2538f9ad72ab00290f73264f71a6d99a433..9e7beecf043a27d854ef5db5656a60a4a7ad3780 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -652,7 +652,7 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
                                return -1;
                } else if (info.control.vif->type == NL80211_IFTYPE_STATION &&
                           is_multicast_ether_addr(hdr->addr1)) {
-                       u8 ap_sta_id = ACCESS_ONCE(mvmvif->ap_sta_id);
+                       u8 ap_sta_id = READ_ONCE(mvmvif->ap_sta_id);
 
                        if (ap_sta_id != IWL_MVM_INVALID_STA)
                                sta_id = ap_sta_id;
@@ -700,7 +700,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
        snap_ip_tcp = 8 + skb_transport_header(skb) - skb_network_header(skb) +
                tcp_hdrlen(skb);
 
-       dbg_max_amsdu_len = ACCESS_ONCE(mvm->max_amsdu_len);
+       dbg_max_amsdu_len = READ_ONCE(mvm->max_amsdu_len);
 
        if (!sta->max_amsdu_len ||
            !ieee80211_is_data_qos(hdr->frame_control) ||