mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 20:32:22 +00:00
iwmc3200wifi: Set wireless mode correctly
Set the wireless mode with regard to both the driver's configuration and the device's EEPROM result. Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
0bed08de91
commit
2351178c52
@ -701,12 +701,12 @@ static int __iwm_up(struct iwm_priv *iwm)
|
||||
|
||||
/*
|
||||
* Read our SKU capabilities.
|
||||
* If it's valid, we overwrite the wireless mode conf entry and the
|
||||
* current profile one.
|
||||
* If it's valid, we AND the configured wireless mode with the
|
||||
* device EEPROM value as the current profile wireless mode.
|
||||
*/
|
||||
wireless_mode = iwm_eeprom_wireless_mode(iwm);
|
||||
if (wireless_mode) {
|
||||
iwm->conf.wireless_mode = wireless_mode;
|
||||
iwm->conf.wireless_mode &= wireless_mode;
|
||||
if (iwm->umac_profile)
|
||||
iwm->umac_profile->wireless_mode =
|
||||
iwm->conf.wireless_mode;
|
||||
|
Loading…
Reference in New Issue
Block a user