summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/wilc_wlan_cfg.c
diff options
context:
space:
mode:
authorAjay Singh <ajay.kathat@microchip.com>2018-09-25 11:53:33 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-25 20:53:57 +0200
commitcb6f1f576ef28750e33d3769b179ee0865cee371 (patch)
tree28fcf5c71b6fa2e0dcaa034dace2ff983e9895d6 /drivers/staging/wilc1000/wilc_wlan_cfg.c
parentacceb12a9f8b97ff0e76d3febed4e9941674e571 (diff)
downloadlinux-cb6f1f576ef28750e33d3769b179ee0865cee371.tar.bz2
staging: wilc1000: rename 'wilc_mac_cfg' struct to 'wilc_cfg_str_vals'
Rename 'wilc_mac_cfg' struct to 'wilc_cfg_str_vals' as its more appropriate for structure to store the values of string configuration. Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wlan_cfg.c')
-rw-r--r--drivers/staging/wilc1000/wilc_wlan_cfg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index 8f1e962d4347..930a3896f4ae 100644
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -438,7 +438,7 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size,
int wilc_wlan_cfg_init(struct wilc *wl)
{
- struct wilc_mac_cfg *mac_cfg;
+ struct wilc_cfg_str_vals *str_vals;
int i = 0;
wl->cfg.b = kmemdup(g_cfg_byte, sizeof(g_cfg_byte), GFP_KERNEL);
@@ -457,20 +457,20 @@ int wilc_wlan_cfg_init(struct wilc *wl)
if (!wl->cfg.s)
goto out_w;
- mac_cfg = kzalloc(sizeof(mac_cfg), GFP_KERNEL);
- if (!mac_cfg)
+ str_vals = kzalloc(sizeof(str_vals), GFP_KERNEL);
+ if (!str_vals)
goto out_s;
- wl->cfg.str_vals = mac_cfg;
+ wl->cfg.str_vals = str_vals;
/* store the string cfg parameters */
wl->cfg.s[i].id = WID_FIRMWARE_VERSION;
- wl->cfg.s[i].str = mac_cfg->firmware_version;
+ wl->cfg.s[i].str = str_vals->firmware_version;
i++;
wl->cfg.s[i].id = WID_MAC_ADDR;
- wl->cfg.s[i].str = mac_cfg->mac_address;
+ wl->cfg.s[i].str = str_vals->mac_address;
i++;
wl->cfg.s[i].id = WID_ASSOC_RES_INFO;
- wl->cfg.s[i].str = mac_cfg->assoc_rsp;
+ wl->cfg.s[i].str = str_vals->assoc_rsp;
i++;
wl->cfg.s[i].id = WID_NIL;
wl->cfg.s[i].str = NULL;