From 785321b623012232df60f1988159b481ebbd1b7f Mon Sep 17 00:00:00 2001 From: George Date: Sat, 3 Sep 2011 10:58:48 -0500 Subject: [PATCH] --- yaml --- r: 263911 b: refs/heads/master c: bac2555c6d86387132930af4d14cb47c4dd3f4f7 h: refs/heads/master i: 263909: bc5f579a33822faecc90a687054399aa4058fd04 263907: 596ba7a35dce97a48fe98bdd88c4b51cfd42f9cc 263903: 2a16ce6a953ec6f5a3eef8c460fbfc95e7ec18ef v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtlwifi/core.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 206da9ef228b..7332a4bfe989 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3401dc6eba788ebc7c14ce51018d775b1c263399 +refs/heads/master: bac2555c6d86387132930af4d14cb47c4dd3f4f7 diff --git a/trunk/drivers/net/wireless/rtlwifi/core.c b/trunk/drivers/net/wireless/rtlwifi/core.c index 1bdc1aa305c0..04c4e9eb6ee6 100644 --- a/trunk/drivers/net/wireless/rtlwifi/core.c +++ b/trunk/drivers/net/wireless/rtlwifi/core.c @@ -610,6 +610,11 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, mac->link_state = MAC80211_NOLINK; memset(mac->bssid, 0, 6); + + /* reset sec info */ + rtl_cam_reset_sec_info(hw); + + rtl_cam_reset_all_entry(hw); mac->vendor = PEER_UNKNOWN; RT_TRACE(rtlpriv, COMP_MAC80211, DBG_DMESG, @@ -1063,6 +1068,9 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, *or clear all entry here. */ rtl_cam_delete_one_entry(hw, mac_addr, key_idx); + + rtl_cam_reset_sec_info(hw); + break; default: RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,