From: Ping-Ke Shih <pks...@realtek.com>

There is a potential race condition when the control byte of a CAM
entry is written first. Write in reverse order to correct the condition.

Signed-off-by: Ping-Ke Shih <pks...@realtek.com>
Signed-off-by: shaofu <sha...@realtek.com>
Signed-off-by: Larry Finger <larry.fin...@lwfinger.net>
---
 drivers/net/wireless/realtek/rtlwifi/cam.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/cam.c 
b/drivers/net/wireless/realtek/rtlwifi/cam.c
index 8fe8b4c..5d58ec0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/cam.c
+++ b/drivers/net/wireless/realtek/rtlwifi/cam.c
@@ -45,12 +45,13 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, 
u32 entry_no,
 
        u32 target_command;
        u32 target_content = 0;
-       u8 entry_i;
+       s8 entry_i;
 
        RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_DMESG, "Key content :",
                      key_cont_128, 16);
 
-       for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+       /* 0-1 config + mac, 2-5 fill 128key,6-7 are reserved */
+       for (entry_i = CAM_CONTENT_COUNT - 1; entry_i >= 0; entry_i--) {
                target_command = entry_i + CAM_CONTENT_COUNT * entry_no;
                target_command = target_command | BIT(31) | BIT(16);
 
@@ -102,7 +103,6 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, 
u32 entry_no,
                                        target_content);
                        rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM],
                                        target_command);
-                       udelay(100);
 
                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
                                 "WRITE A4: %x\n", target_content);
-- 
2.10.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to