};
 
 
-struct RT_PMKID_LIST {
+struct rt_pmkid_list {
        u8                              bUsed;
        u8                              Bssid[6];
        u8                              PMKID[16];
        u32 btkip_countermeasure_time;
 
        /*  For WPA2 Pre-Authentication. */
-       struct RT_PMKID_LIST            PMKIDList[NUM_PMKID_CACHE];     /*  Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. */
+       struct rt_pmkid_list            PMKIDList[NUM_PMKID_CACHE];     /*  Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. */
        u8              PMKIDIndex;
 
        u8 bWepDefaultKeyIdxSet;
 
 
        DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
 
-       memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);
+       memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
        psecuritypriv->PMKIDIndex = 0;
 
        return 0;
 
                }
        } else if (pPMK->cmd == IW_PMKSA_FLUSH) {
                DBG_871X("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n");
-               memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);
+               memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
                psecuritypriv->PMKIDIndex = 0;
                intReturn = true;
        }
 
        indicate_wx_scan_complete_event(padapter);
 }
 
-static struct RT_PMKID_LIST   backupPMKIDList[NUM_PMKID_CACHE];
+static struct rt_pmkid_list   backupPMKIDList[NUM_PMKID_CACHE];
 void rtw_reset_securitypriv(struct adapter *adapter)
 {
        u8 backupPMKIDIndex = 0;
                /*  Backup the btkip_countermeasure information. */
                /*  When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */
 
-               memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);
+               memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
                backupPMKIDIndex = adapter->securitypriv.PMKIDIndex;
                backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure;
                backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time;
 
                /*  Added by Albert 2009/02/18 */
                /*  Restore the PMK information to securitypriv structure for the following connection. */
-               memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);
+               memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
                adapter->securitypriv.PMKIDIndex = backupPMKIDIndex;
                adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure;
                adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time;
 
 void rtw_os_indicate_disconnect(struct adapter *adapter)
 {
-       /* struct RT_PMKID_LIST   backupPMKIDList[ NUM_PMKID_CACHE ]; */
+       /* struct rt_pmkid_list   backupPMKIDList[ NUM_PMKID_CACHE ]; */
 
        netif_carrier_off(adapter->pnetdev); /*  Do it first for tx broadcast pkt after disconnection issue! */