summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2009-11-24 11:33:30 +0800
committerJohn W. Linville <linville@tuxdriver.com>2009-11-28 15:04:43 -0500
commit2351178c52fedf1846c84b35418f4102487ec00e (patch)
tree7da9868448b6c4cabf315a1cec5597fe3a120520 /drivers/net/wireless/iwmc3200wifi
parent0bed08de91c41b21447d704995a438d4536586ba (diff)
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>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index e61265af92c..92e4eaf32ff 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -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;