Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8712 / rtl871x_cmd.c

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 659683e022b949e3146f5c5388dc50ec76bc5b7b..31f31dbf7f3166654c068ca83c46dcc2d287d3e9 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -814,7 +814,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr)
        struct cmd_priv                 *pcmdpriv = &padapter->cmdpriv;
        struct cmd_obj                  *ph2c;
        struct set_assocsta_parm        *psetassocsta_para;
-       struct set_stakey_rsp           *psetassocsta_rsp = NULL;
+       struct set_assocsta_rsp         *psetassocsta_rsp = NULL;
 
        ph2c = (struct cmd_obj *)_malloc(sizeof(struct cmd_obj));
        if (ph2c == NULL)
@@ -825,7 +825,7 @@ u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr)
                kfree((u8 *) ph2c);
                return _FAIL;
        }
-       psetassocsta_rsp = (struct set_stakey_rsp *)_malloc(
+       psetassocsta_rsp = (struct set_assocsta_rsp *)_malloc(
                            sizeof(struct set_assocsta_rsp));
        if (psetassocsta_rsp == NULL) {
                kfree((u8 *)ph2c);