diff mbox

[5/8] iwmc3200wifi: Set wireless mode correctly

Message ID 1259033613-25600-6-git-send-email-yi.zhu@intel.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Zhu Yi Nov. 24, 2009, 3:33 a.m. UTC 
None
diff mbox

Patch

diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index e61265a..92e4eaf 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;