staging: r8712u: Merging Realtek's latest (v2.6.6). New decl's and defines.

Removed unnecessary casts in kfree calls.
A few new types, defines and prototypes.

Signed-off-by: Ali Bahar <ali@internetDog.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h
index a4eecc6..766a646 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_cmd.h
+++ b/drivers/staging/rtl8712/rtl8712_cmd.h
@@ -26,9 +26,15 @@
 #ifndef __RTL8712_CMD_H_
 #define __RTL8712_CMD_H_
 
+#define CMD_HDR_SZ      8
+
 u8 r8712_fw_cmd(struct _adapter *pAdapter, u32 cmd);
 void r8712_fw_cmd_data(struct _adapter *pAdapter, u32 *value, u8 flag);
 
+struct cmd_hdr {
+       u32 cmd_dw0;
+       u32 cmd_dw1;
+};
 
 enum rtl8712_h2c_cmd {
        GEN_CMD_CODE(_Read_MACREG),     /*0*/
@@ -97,6 +103,40 @@ enum rtl8712_h2c_cmd {
        GEN_CMD_CODE(_SetPowerTracking),
        GEN_CMD_CODE(_AMSDU_TO_AMPDU), /*57*/
        GEN_CMD_CODE(_SetMacAddress), /*58*/
+
+       GEN_CMD_CODE(_DisconnectCtrl), /*59*/
+       GEN_CMD_CODE(_SetChannelPlan), /*60*/
+       GEN_CMD_CODE(_DisconnectCtrlEx), /*61*/
+
+       /* To do, modify these h2c cmd, add or delete */
+       GEN_CMD_CODE(_GetH2cLbk) ,
+
+       /* WPS extra IE */
+       GEN_CMD_CODE(_SetProbeReqExtraIE) ,
+       GEN_CMD_CODE(_SetAssocReqExtraIE) ,
+       GEN_CMD_CODE(_SetProbeRspExtraIE) ,
+       GEN_CMD_CODE(_SetAssocRspExtraIE) ,
+
+       /* the following is driver will do */
+       GEN_CMD_CODE(_GetCurDataRate) ,
+
+       GEN_CMD_CODE(_GetTxRetrycnt),  /* to record times that Tx retry to
+                                       * transmmit packet after association
+                                       */
+       GEN_CMD_CODE(_GetRxRetrycnt),  /* to record total number of the
+                                       * received frame with ReTry bit set in
+                                       * the WLAN header
+                                       */
+
+       GEN_CMD_CODE(_GetBCNOKcnt),
+       GEN_CMD_CODE(_GetBCNERRcnt),
+       GEN_CMD_CODE(_GetCurTxPwrLevel),
+
+       GEN_CMD_CODE(_SetDIG),
+       GEN_CMD_CODE(_SetRA),
+       GEN_CMD_CODE(_SetPT),
+       GEN_CMD_CODE(_ReadTSSI),
+
        MAX_H2CCMD
 };
 
@@ -176,6 +216,28 @@ static struct _cmd_callback        cmd_callback[] = {
        {GEN_CMD_CODE(_SetPowerTracking), NULL},
        {GEN_CMD_CODE(_AMSDU_TO_AMPDU), NULL}, /*57*/
        {GEN_CMD_CODE(_SetMacAddress), NULL}, /*58*/
+
+       {GEN_CMD_CODE(_DisconnectCtrl), NULL}, /*59*/
+       {GEN_CMD_CODE(_SetChannelPlan), NULL}, /*60*/
+       {GEN_CMD_CODE(_DisconnectCtrlEx), NULL}, /*61*/
+
+       /* To do, modify these h2c cmd, add or delete */
+       {GEN_CMD_CODE(_GetH2cLbk), NULL},
+
+       {_SetProbeReqExtraIE_CMD_, NULL},
+       {_SetAssocReqExtraIE_CMD_, NULL},
+       {_SetProbeRspExtraIE_CMD_, NULL},
+       {_SetAssocRspExtraIE_CMD_, NULL},
+       {_GetCurDataRate_CMD_, NULL},
+       {_GetTxRetrycnt_CMD_, NULL},
+       {_GetRxRetrycnt_CMD_, NULL},
+       {_GetBCNOKcnt_CMD_, NULL},
+       {_GetBCNERRcnt_CMD_, NULL},
+       {_GetCurTxPwrLevel_CMD_, NULL},
+       {_SetDIG_CMD_, NULL},
+       {_SetRA_CMD_, NULL},
+       {_SetPT_CMD_, NULL},
+       {GEN_CMD_CODE(_ReadTSSI), &r8712_readtssi_cmdrsp_callback}
 };
 #endif
 

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e188d8d..c416ee3 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -371,8 +371,17 @@ u8 r8712_getrfreg_cmd(struct _adapter *padapter, u8 offset, u8 *pval)
 void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,
                                      struct cmd_obj *pcmd)
 {
-       kfree((unsigned char *) pcmd->parmbuf);
-       kfree((unsigned char *) pcmd);
+       kfree(pcmd->parmbuf);
+       kfree(pcmd);
+       padapter->mppriv.workparam.bcompleted = true;
+}
+
+void r8712_readtssi_cmdrsp_callback(struct _adapter *padapter,
+                               struct cmd_obj *pcmd)
+{
+       kfree(pcmd->parmbuf);
+       kfree(pcmd);
+
        padapter->mppriv.workparam.bcompleted = true;
 }
 

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h
index 25ef848..2aab78a 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -728,10 +728,14 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
                                  struct cmd_obj *pcmd);
 void r8712_getbbrfreg_cmdrsp_callback(struct _adapter *padapter,
                                      struct cmd_obj *pcmd);
+void r8712_readtssi_cmdrsp_callback(struct _adapter *padapter,
+                               struct cmd_obj *pcmd);
 void r8712_setstaKey_cmdrsp_callback(struct _adapter  *padapter,
                                     struct cmd_obj *pcmd);
 void r8712_setassocsta_cmdrsp_callback(struct _adapter  *padapter,
                                       struct cmd_obj *pcmd);
+u8 r8712_disconnectCtrlEx_cmd(struct _adapter *adapter, u32 enableDrvCtrl,
+                       u32 tryPktCnt, u32 tryPktInterval, u32 firstStageTO);
 
 struct _cmd_callback {
        u32     cmd_code;