Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2351178c authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

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: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0bed08de

drivers/net/wireless/iwmc3200wifi/main.c

+3 −3
Original line number Diff line number Diff line
@@ -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;