Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

iwmc3200wifi: Set wireless mode correctly

Browse Source 
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:
Zhu Yi 2009-11-24 11:33:30 +08:00 committed by John W. Linville
parent 0bed08de91
commit 2351178c52
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwmc3200wifi/main.c
View File

@ -701,12 +701,12 @@ static int __iwm_up(struct iwm_priv *iwm)
/* /*
* Read our SKU capabilities. * Read our SKU capabilities.
* If it's valid, we overwrite the wireless mode conf entry and the * If it's valid, we AND the configured wireless mode with the
* current profile one. * device EEPROM value as the current profile wireless mode.
*/ */
wireless_mode = iwm_eeprom_wireless_mode(iwm); wireless_mode = iwm_eeprom_wireless_mode(iwm);
if (wireless_mode) { if (wireless_mode) {
iwm->conf.wireless_mode = wireless_mode; iwm->conf.wireless_mode &= wireless_mode;
if (iwm->umac_profile) if (iwm->umac_profile)
iwm->umac_profile->wireless_mode = iwm->umac_profile->wireless_mode =
iwm->conf.wireless_mode; iwm->conf.wireless_mode;