jiffies + msecs_to_jiffies(2000));
 }
 
-void r8712_init_mlme_timer(struct _adapter *padapter)
+void r8712_init_mlme_timer(struct _adapter *adapter)
 {
-       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
+       struct  mlme_priv *mlmepriv = &adapter->mlmepriv;
 
-       timer_setup(&pmlmepriv->assoc_timer, join_timeout_handler, 0);
-       timer_setup(&pmlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer,
+       timer_setup(&mlmepriv->assoc_timer, join_timeout_handler, 0);
+       timer_setup(&mlmepriv->sitesurveyctrl.sitesurvey_ctrl_timer,
                    sitesurvey_ctrl_handler, 0);
-       timer_setup(&pmlmepriv->scan_to_timer, _scan_timeout_handler, 0);
-       timer_setup(&pmlmepriv->dhcp_timer, dhcp_timeout_handler, 0);
-       timer_setup(&pmlmepriv->wdg_timer, wdg_timeout_handler, 0);
+       timer_setup(&mlmepriv->scan_to_timer, _scan_timeout_handler, 0);
+       timer_setup(&mlmepriv->dhcp_timer, dhcp_timeout_handler, 0);
+       timer_setup(&mlmepriv->wdg_timer, wdg_timeout_handler, 0);
 }
 
 void r8712_os_indicate_connect(struct _adapter *adapter)
                adapter->securitypriv.btkip_countermeasure =
                                         backupTKIPCountermeasure;
        } else { /*reset values in securitypriv*/
-               struct security_priv *psec_priv = &adapter->securitypriv;
-
-               psec_priv->AuthAlgrthm = 0; /*open system*/
-               psec_priv->PrivacyAlgrthm = _NO_PRIVACY_;
-               psec_priv->PrivacyKeyIndex = 0;
-               psec_priv->XGrpPrivacy = _NO_PRIVACY_;
-               psec_priv->XGrpKeyid = 1;
-               psec_priv->ndisauthtype = Ndis802_11AuthModeOpen;
-               psec_priv->ndisencryptstatus = Ndis802_11WEPDisabled;
-               psec_priv->wps_phase = false;
+               struct security_priv *sec_priv = &adapter->securitypriv;
+
+               sec_priv->AuthAlgrthm = 0; /*open system*/
+               sec_priv->PrivacyAlgrthm = _NO_PRIVACY_;
+               sec_priv->PrivacyKeyIndex = 0;
+               sec_priv->XGrpPrivacy = _NO_PRIVACY_;
+               sec_priv->XGrpKeyid = 1;
+               sec_priv->ndisauthtype = Ndis802_11AuthModeOpen;
+               sec_priv->ndisencryptstatus = Ndis802_11WEPDisabled;
+               sec_priv->wps_phase = false;
        }
 }