addr_t addr;
        u8 *pframe, *mem_start, *ptxdesc;
        struct sta_info         *psta;
-       struct security_priv    *psecuritypriv = &padapter->securitypriv;
+       struct security_priv    *psecpriv = &padapter->securitypriv;
        struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
        struct xmit_priv        *pxmitpriv = &padapter->xmitpriv;
        struct pkt_attrib       *pattrib = &pxmitframe->attrib;
                                case _WEP40_:
                                case _WEP104_:
                                        WEP_IV(pattrib->iv, psta->txpn,
-                                              (u8)psecuritypriv->
-                                              PrivacyKeyIndex);
+                                              (u8)psecpriv->PrivacyKeyIndex);
                                        break;
                                case _TKIP_:
                                        if (bmcst)
                                                TKIP_IV(pattrib->iv,
                                                    psta->txpn,
-                                                   (u8)psecuritypriv->
-                                                   XGrpKeyid);
+                                                   (u8)psecpriv->XGrpKeyid);
                                        else
                                                TKIP_IV(pattrib->iv, psta->txpn,
                                                        0);
                                case _AES_:
                                        if (bmcst)
                                                AES_IV(pattrib->iv, psta->txpn,
-                                                   (u8)psecuritypriv->
-                                                   XGrpKeyid);
+                                                   (u8)psecpriv->XGrpKeyid);
                                        else
                                                AES_IV(pattrib->iv, psta->txpn,
                                                       0);