]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: rtl8188eu: rtw_cmd.h: Remove struct Tx_Beacon_param
authornavin patidar <navin.patidar@gmail.com>
Thu, 10 Jul 2014 03:41:54 +0000 (09:11 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jul 2014 04:14:34 +0000 (21:14 -0700)
struct Tx_Beacon_param has only one member.

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
drivers/staging/rtl8188eu/include/rtw_cmd.h
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h

index 3bd3962de1766f6d336b0f97ea15633cb4ec0e04..b4dd14e21531557e9dd7abbdf9ae12e51f021cee 100644 (file)
@@ -5416,7 +5416,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
 u8 set_tx_beacon_cmd(struct adapter *padapter)
 {
        struct cmd_obj  *ph2c;
-       struct Tx_Beacon_param  *ptxBeacon_parm;
+       struct wlan_bssid_ex    *ptxBeacon_parm;
        struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -5430,19 +5430,19 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
                goto exit;
        }
 
-       ptxBeacon_parm = kzalloc(sizeof(struct Tx_Beacon_param), GFP_KERNEL);
+       ptxBeacon_parm = kzalloc(sizeof(struct wlan_bssid_ex), GFP_KERNEL);
        if (ptxBeacon_parm == NULL) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
        }
 
-       memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(struct wlan_bssid_ex));
+       memcpy(ptxBeacon_parm, &(pmlmeinfo->network), sizeof(struct wlan_bssid_ex));
 
-       len_diff = update_hidden_ssid(ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_,
-                                     ptxBeacon_parm->network.IELength-_BEACON_IE_OFFSET_,
+       len_diff = update_hidden_ssid(ptxBeacon_parm->IEs+_BEACON_IE_OFFSET_,
+                                     ptxBeacon_parm->IELength-_BEACON_IE_OFFSET_,
                                      pmlmeinfo->hidden_ssid_mode);
-       ptxBeacon_parm->network.IELength += len_diff;
+       ptxBeacon_parm->IELength += len_diff;
 
        init_h2fwcmd_w_parm_no_rsp(ph2c, ptxBeacon_parm, GEN_CMD_CODE(_TX_Beacon));
 
index 6ff500c6fbaf9c51fd90714b26c39879ce51b6af..d6b87243326de8a988174300fb9c2a6d96a445b8 100644 (file)
@@ -353,10 +353,6 @@ struct     getphy_parm {
 
 };
 
-struct Tx_Beacon_param {
-       struct wlan_bssid_ex network;
-};
-
 /*
        Notes: This command is used for H2C/C2H loopback testing
 
index 1fdd1f8ed014b090f0b9f3935fe5bddd33b193ac..2a32caa72b7e1b0db16ed9fc7e4a397971058517 100644 (file)
@@ -764,7 +764,7 @@ static struct cmd_hdl wlancmds[] = {
        GEN_MLME_EXT_HANDLER(0, NULL)
        GEN_MLME_EXT_HANDLER(0, NULL)
        GEN_MLME_EXT_HANDLER(0, NULL)
-       GEN_MLME_EXT_HANDLER(sizeof(struct Tx_Beacon_param),
+       GEN_MLME_EXT_HANDLER(sizeof(struct wlan_bssid_ex),
                             tx_beacon_hdl) /*55*/
 
        GEN_MLME_EXT_HANDLER(0, mlme_evt_hdl) /*56*/