AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rtl2800usb: Fix incorrect storage of MAC address on big-endian platforms

Browse Source 
The eeprom data is stored in little-endian order in the rt2x00 library.
As it was converted to cpu order in the read routines, the data need to
be converted to LE on a big-endian platform.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Larry Finger 2011-09-14 16:50:23 -05:00 committed by John W. Linville
parent d331eb51e4
commit daabead1c3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/rt2x00/rt2800lib.c
View File

@ -3697,14 +3697,15 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i)
rt2800_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, &reg); rt2800_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, &reg);
/* Apparently the data is read from end to start */ /* Apparently the data is read from end to start */
rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, &reg);
(u32 *)&rt2x00dev->eeprom[i]); /* The returned value is in CPU order, but eeprom is le */
rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, rt2x00dev->eeprom[i] = cpu_to_le32(reg);
(u32 *)&rt2x00dev->eeprom[i + 2]); rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, &reg);
rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg);
(u32 *)&rt2x00dev->eeprom[i + 4]); rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, &reg);
rt2800_register_read_lock(rt2x00dev, EFUSE_DATA0, *(u32 *)&rt2x00dev->eeprom[i + 4] = cpu_to_le32(reg);
(u32 *)&rt2x00dev->eeprom[i + 6]); rt2800_register_read_lock(rt2x00dev, EFUSE_DATA0, &reg);
*(u32 *)&rt2x00dev->eeprom[i + 6] = cpu_to_le32(reg);
mutex_unlock(&rt2x00dev->csr_mutex); mutex_unlock(&rt2x00dev->csr_mutex);
} }