openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8192e: Clean up MlmeDisassociateRequest 

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack 2011-02-06 22:57:18 +09:00 committed by Greg Kroah-Hartman
parent ea66f752c0
commit ec984e0cab
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/staging/rtl8192e/r8190_rtl8256.c
View File

@ -635,57 +635,30 @@ MlmeDisassociateRequest(
} }
static void static void MgntDisconnectAP(struct net_device *dev, u8 asRsn)
MgntDisconnectAP(
struct net_device* dev,
u8 asRsn
)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
bool bFilterOutNonAssociatedBSSID = false; bool bFilterOutNonAssociatedBSSID = false;
u32 RegRCR, Type;
// /* If disconnect, clear RCR CBSSID bit */
// Commented out by rcnjko, 2005.01.27:
// I move SecClearAllKeys() to MgntActSet_802_11_DISASSOCIATE().
//
// //2004/09/15, kcwu, the key should be cleared, or the new handshaking will not success
// SecClearAllKeys(Adapter);
// In WPA WPA2 need to Clear all key ... because new key will set after new handshaking.
#ifdef TO_DO
if( pMgntInfo->SecurityInfo.AuthMode > RT_802_11AuthModeAutoSwitch ||
(pMgntInfo->bAPSuportCCKM && pMgntInfo->bCCX8021xenable) ) // In CCKM mode will Clear key
{
SecClearAllKeys(Adapter);
RT_TRACE(COMP_SEC, DBG_LOUD,("======>CCKM clear key..."))
}
#endif
// If disconnect, clear RCR CBSSID bit
bFilterOutNonAssociatedBSSID = false; bFilterOutNonAssociatedBSSID = false;
{
u32 RegRCR, Type;
Type = bFilterOutNonAssociatedBSSID; Type = bFilterOutNonAssociatedBSSID;
//Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RCR, (pu1Byte)(&RegRCR)); RegRCR = read_nic_dword(priv, RCR);
RegRCR = read_nic_dword(priv, RCR); priv->ReceiveConfig = RegRCR;
priv->ReceiveConfig = RegRCR;
if (Type == true) if (Type == true)
RegRCR |= (RCR_CBSSID); RegRCR |= (RCR_CBSSID);
else if (Type == false) else if (Type == false)
RegRCR &= (~RCR_CBSSID); RegRCR &= (~RCR_CBSSID);
write_nic_dword(priv, RCR, RegRCR); write_nic_dword(priv, RCR, RegRCR);
priv->ReceiveConfig = RegRCR; priv->ReceiveConfig = RegRCR;
MlmeDisassociateRequest(dev, priv->ieee80211->current_network.bssid, asRsn);
}
// 2004.10.11, by rcnjko.
//MlmeDisassociateRequest( Adapter, pMgntInfo->Bssid, disas_lv_ss );
MlmeDisassociateRequest( dev, priv->ieee80211->current_network.bssid, asRsn );
priv->ieee80211->state = IEEE80211_NOLINK; priv->ieee80211->state = IEEE80211_NOLINK;
//pMgntInfo->AsocTimestamp = 0;
} }