projects / deliverable / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_cmd.c
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index a67185db392b653546dba84b23e1eee635eb654e..7a252200e9026322c8428f18a482738cf7609fb5 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -64,13 +64,14 @@ static sint _init_cmd_priv(struct cmd_priv *pcmdpriv)
 
        /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
        pcmdpriv->cmd_seq = 1;
-       pcmdpriv->cmd_allocated_buf = _malloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ);
+       pcmdpriv->cmd_allocated_buf = kmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ,
+                                             GFP_ATOMIC);
        if (pcmdpriv->cmd_allocated_buf == NULL)
                return _FAIL;
        pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf  +  CMDBUFF_ALIGN_SZ -
                            ((addr_t)(pcmdpriv->cmd_allocated_buf) &
                            (CMDBUFF_ALIGN_SZ-1));
-       pcmdpriv->rsp_allocated_buf = _malloc(MAX_RSPSZ + 4);
+       pcmdpriv->rsp_allocated_buf = kmalloc(MAX_RSPSZ + 4, GFP_ATOMIC);
        if (pcmdpriv->rsp_allocated_buf == NULL)
                return _FAIL;
        pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf  +  4 -
@@ -85,7 +86,7 @@ static sint _init_evt_priv(struct evt_priv *pevtpriv)
 {
        /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
        pevtpriv->event_seq = 0;
-       pevtpriv->evt_allocated_buf = _malloc(MAX_EVTSZ + 4);
+       pevtpriv->evt_allocated_buf = kmalloc(MAX_EVTSZ + 4, GFP_ATOMIC);
 
        if (pevtpriv->evt_allocated_buf == NULL)
                return _FAIL;
@@ -226,11 +227,10 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psurveyPara = (struct sitesurvey_parm *)_malloc(
-                      sizeof(struct sitesurvey_parm));
+       psurveyPara = kmalloc(sizeof(struct sitesurvey_parm), GFP_ATOMIC);
        if (psurveyPara == NULL) {
                kfree((unsigned char *) ph2c);
                return _FAIL;
@@ -259,11 +259,11 @@ u8 r8712_setdatarate_cmd(struct _adapter *padapter, u8 *rateset)
        struct setdatarate_parm *pbsetdataratepara;
        struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pbsetdataratepara = (struct setdatarate_parm *)_malloc(
-                            sizeof(struct setdatarate_parm));
+       pbsetdataratepara = kmalloc(sizeof(struct setdatarate_parm),
+                                   GFP_ATOMIC);
        if (pbsetdataratepara == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -282,11 +282,11 @@ u8 r8712_set_chplan_cmd(struct _adapter *padapter, int chplan)
        struct SetChannelPlan_param *psetchplanpara;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetchplanpara = (struct SetChannelPlan_param *)
-               _malloc(sizeof(struct SetChannelPlan_param));
+       psetchplanpara = kmalloc(sizeof(struct SetChannelPlan_param),
+                                GFP_ATOMIC);
        if (psetchplanpara == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -304,11 +304,11 @@ u8 r8712_setbasicrate_cmd(struct _adapter *padapter, u8 *rateset)
        struct setbasicrate_parm *pssetbasicratepara;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pssetbasicratepara = (struct setbasicrate_parm *)_malloc(
-                             sizeof(struct setbasicrate_parm));
+       pssetbasicratepara = kmalloc(sizeof(struct setbasicrate_parm),
+                                    GFP_ATOMIC);
        if (pssetbasicratepara == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -327,11 +327,10 @@ u8 r8712_setptm_cmd(struct _adapter *padapter, u8 type)
        struct writePTM_parm    *pwriteptmparm;
        struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pwriteptmparm = (struct writePTM_parm *)
-               _malloc(sizeof(struct writePTM_parm));
+       pwriteptmparm = kmalloc(sizeof(struct writePTM_parm), GFP_ATOMIC);
        if (pwriteptmparm == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -348,11 +347,10 @@ u8 r8712_setfwdig_cmd(struct _adapter *padapter, u8 type)
        struct writePTM_parm *pwriteptmparm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pwriteptmparm = (struct writePTM_parm *)
-               _malloc(sizeof(struct setdig_parm));
+       pwriteptmparm = kmalloc(sizeof(struct writePTM_parm), GFP_ATOMIC);
        if (pwriteptmparm == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -369,11 +367,10 @@ u8 r8712_setfwra_cmd(struct _adapter *padapter, u8 type)
        struct writePTM_parm *pwriteptmparm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pwriteptmparm = (struct writePTM_parm *)
-               _malloc(sizeof(struct setra_parm));
+       pwriteptmparm = kmalloc(sizeof(struct writePTM_parm), GFP_ATOMIC);
        if (pwriteptmparm == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -390,11 +387,10 @@ u8 r8712_setrfreg_cmd(struct _adapter  *padapter, u8 offset, u32 val)
        struct writeRF_parm *pwriterfparm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pwriterfparm = (struct writeRF_parm *)_malloc(
-                       sizeof(struct writeRF_parm));
+       pwriterfparm = kmalloc(sizeof(struct writeRF_parm), GFP_ATOMIC);
        if (pwriterfparm == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -412,10 +408,10 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
        struct readRF_parm *prdrfparm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       prdrfparm = (struct readRF_parm *)_malloc(sizeof(struct readRF_parm));
+       prdrfparm = kmalloc(sizeof(struct readRF_parm), GFP_ATOMIC);
        if (prdrfparm == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -456,7 +452,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
                                 &padapter->registrypriv.dev_network;
 
        padapter->ledpriv.LedControlHandler(padapter, LED_CTL_START_TO_LINK);
-       pcmd = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (pcmd == NULL)
                return _FAIL;
        _init_listhead(&pcmd->list);
@@ -490,7 +486,7 @@ u8 r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
                                                network.InfrastructureMode;
 
        padapter->ledpriv.LedControlHandler(padapter, LED_CTL_START_TO_LINK);
-       pcmd = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       pcmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (pcmd == NULL)
                return _FAIL;
        t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
@@ -628,11 +624,10 @@ u8 r8712_disassoc_cmd(struct _adapter *padapter) /* for sta_mode */
        struct disconnect_parm *pdisconnect;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       pdisconnect_cmd = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       pdisconnect_cmd = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (pdisconnect_cmd == NULL)
                return _FAIL;
-       pdisconnect = (struct disconnect_parm *)_malloc(
-                     sizeof(struct disconnect_parm));
+       pdisconnect = kmalloc(sizeof(struct disconnect_parm), GFP_ATOMIC);
        if (pdisconnect == NULL) {
                kfree((u8 *)pdisconnect_cmd);
                return _FAIL;
@@ -651,11 +646,10 @@ u8 r8712_setopmode_cmd(struct _adapter *padapter,
 
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetop = (struct setopmode_parm *)_malloc(
-                 sizeof(struct setopmode_parm));
+       psetop = kmalloc(sizeof(struct setopmode_parm), GFP_ATOMIC);
        if (psetop == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -676,17 +670,15 @@ u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key)
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        struct sta_info *sta = (struct sta_info *)psta;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetstakey_para = (struct set_stakey_parm *)_malloc(
-                         sizeof(struct set_stakey_parm));
+       psetstakey_para = kmalloc(sizeof(struct set_stakey_parm), GFP_ATOMIC);
        if (psetstakey_para == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
        }
-       psetstakey_rsp = (struct set_stakey_rsp *)_malloc(
-                         sizeof(struct set_stakey_rsp));
+       psetstakey_rsp = kmalloc(sizeof(struct set_stakey_rsp), GFP_ATOMIC);
        if (psetstakey_rsp == NULL) {
                kfree((u8 *) ph2c);
                kfree((u8 *) psetstakey_para);
@@ -718,11 +710,10 @@ u8 r8712_setrfintfs_cmd(struct _adapter *padapter, u8 mode)
        struct setrfintfs_parm *psetrfintfsparm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetrfintfsparm = (struct setrfintfs_parm *)_malloc(
-                          sizeof(struct setrfintfs_parm));
+       psetrfintfsparm = kmalloc(sizeof(struct setrfintfs_parm), GFP_ATOMIC);
        if (psetrfintfsparm == NULL) {
                kfree((unsigned char *) ph2c);
                return _FAIL;
@@ -741,11 +732,10 @@ u8 r8712_setrttbl_cmd(struct _adapter *padapter,
        struct setratable_parm *psetrttblparm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetrttblparm = (struct setratable_parm *)_malloc(
-                       sizeof(struct setratable_parm));
+       psetrttblparm = kmalloc(sizeof(struct setratable_parm), GFP_ATOMIC);
        if (psetrttblparm == NULL) {
                kfree((unsigned char *)ph2c);
                return _FAIL;
@@ -763,11 +753,10 @@ u8 r8712_gettssi_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
        struct cmd_obj *ph2c;
        struct readTSSI_parm *prdtssiparm;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       prdtssiparm = (struct readTSSI_parm *)
-               _malloc(sizeof(struct readTSSI_parm));
+       prdtssiparm = kmalloc(sizeof(struct readTSSI_parm), GFP_ATOMIC);
        if (prdtssiparm == NULL) {
                kfree((unsigned char *) ph2c);
                return _FAIL;
@@ -790,11 +779,11 @@ u8 r8712_setMacAddr_cmd(struct _adapter *padapter, u8 *mac_addr)
        struct cmd_obj *ph2c;
        struct SetMacAddr_param *psetMacAddr_para;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetMacAddr_para = (struct SetMacAddr_param *)_malloc(
-                          sizeof(struct SetMacAddr_param));
+       psetMacAddr_para = kmalloc(sizeof(struct SetMacAddr_param),
+                                  GFP_ATOMIC);
        if (psetMacAddr_para == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
@@ -813,17 +802,17 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr)
        struct set_assocsta_parm        *psetassocsta_para;
        struct set_assocsta_rsp         *psetassocsta_rsp = NULL;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       psetassocsta_para = (struct set_assocsta_parm *)
-                           _malloc(sizeof(struct set_assocsta_parm));
+       psetassocsta_para = kmalloc(sizeof(struct set_assocsta_parm),
+                                   GFP_ATOMIC);
        if (psetassocsta_para == NULL) {
                kfree((u8 *) ph2c);
                return _FAIL;
        }
-       psetassocsta_rsp = (struct set_assocsta_rsp *)_malloc(
-                           sizeof(struct set_assocsta_rsp));
+       psetassocsta_rsp = kmalloc(sizeof(struct set_assocsta_rsp),
+                                  GFP_ATOMIC);
        if (psetassocsta_rsp == NULL) {
                kfree((u8 *)ph2c);
                kfree((u8 *)psetassocsta_para);
@@ -843,11 +832,10 @@ u8 r8712_addbareq_cmd(struct _adapter *padapter, u8 tid)
        struct cmd_obj          *ph2c;
        struct addBaReq_parm    *paddbareq_parm;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       paddbareq_parm = (struct addBaReq_parm *)_malloc(
-                         sizeof(struct addBaReq_parm));
+       paddbareq_parm = kmalloc(sizeof(struct addBaReq_parm), GFP_ATOMIC);
        if (paddbareq_parm == NULL) {
                kfree((unsigned char *)ph2c);
                return _FAIL;
@@ -865,11 +853,10 @@ u8 r8712_wdg_wk_cmd(struct _adapter *padapter)
        struct drvint_cmd_parm  *pdrvintcmd_param;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       pdrvintcmd_param = (struct drvint_cmd_parm *)_malloc(
-                          sizeof(struct drvint_cmd_parm));
+       pdrvintcmd_param = kmalloc(sizeof(struct drvint_cmd_parm), GFP_ATOMIC);
        if (pdrvintcmd_param == NULL) {
                kfree((unsigned char *)ph2c);
                return _FAIL;
@@ -1040,16 +1027,14 @@ u8 r8712_disconnectCtrlEx_cmd(struct _adapter *adapter, u32 enableDrvCtrl,
        struct DisconnectCtrlEx_param *param;
        struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
 
-       ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
+       ph2c = kmalloc(sizeof(struct cmd_obj), GFP_ATOMIC);
        if (ph2c == NULL)
                return _FAIL;
-       param = (struct DisconnectCtrlEx_param *)
-               _malloc(sizeof(struct DisconnectCtrlEx_param));
+       param = kzalloc(sizeof(struct DisconnectCtrlEx_param), GFP_ATOMIC);
        if (param == NULL) {
                kfree((unsigned char *) ph2c);
                return _FAIL;
        }
-       memset(param, 0, sizeof(struct DisconnectCtrlEx_param));
 
        param->EnableDrvCtrl = (unsigned char)enableDrvCtrl;
        param->TryPktCnt = (unsigned char)tryPktCnt;
Linux kernel - Deliverables
This page took 0.034516 seconds and 5 git commands to generate.