diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c index 75e96db6626b..80fefe7d7b8c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c @@ -249,7 +249,7 @@ static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,  	 */  	if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT) &&  	    (flags & IEEE80211_CHAN_NO_IR)) -		flags |= IEEE80211_CHAN_GO_CONCURRENT; +		flags |= IEEE80211_CHAN_IR_CONCURRENT;  	return flags;  } @@ -471,7 +471,7 @@ static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw,  	if (cfg->device_family != IWL_DEVICE_FAMILY_8000)  		return le16_to_cpup(nvm_sw + RADIO_CFG); -	return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000)); +	return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_8000));  }  |