Commit cb6f1f57 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

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: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acceb12a
...@@ -438,7 +438,7 @@ void wilc_wlan_cfg_indicate_rx(struct wilc *wilc, u8 *frame, int size, ...@@ -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) int wilc_wlan_cfg_init(struct wilc *wl)
{ {
struct wilc_mac_cfg *mac_cfg; struct wilc_cfg_str_vals *str_vals;
int i = 0; int i = 0;
wl->cfg.b = kmemdup(g_cfg_byte, sizeof(g_cfg_byte), GFP_KERNEL); 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) ...@@ -457,20 +457,20 @@ int wilc_wlan_cfg_init(struct wilc *wl)
if (!wl->cfg.s) if (!wl->cfg.s)
goto out_w; goto out_w;
mac_cfg = kzalloc(sizeof(mac_cfg), GFP_KERNEL); str_vals = kzalloc(sizeof(str_vals), GFP_KERNEL);
if (!mac_cfg) if (!str_vals)
goto out_s; goto out_s;
wl->cfg.str_vals = mac_cfg; wl->cfg.str_vals = str_vals;
/* store the string cfg parameters */ /* store the string cfg parameters */
wl->cfg.s[i].id = WID_FIRMWARE_VERSION; 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++; i++;
wl->cfg.s[i].id = WID_MAC_ADDR; 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++; i++;
wl->cfg.s[i].id = WID_ASSOC_RES_INFO; 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++; i++;
wl->cfg.s[i].id = WID_NIL; wl->cfg.s[i].id = WID_NIL;
wl->cfg.s[i].str = NULL; wl->cfg.s[i].str = NULL;
......
...@@ -27,7 +27,7 @@ struct wilc_cfg_str { ...@@ -27,7 +27,7 @@ struct wilc_cfg_str {
u8 *str; u8 *str;
}; };
struct wilc_mac_cfg { struct wilc_cfg_str_vals {
u8 mac_address[7]; u8 mac_address[7];
u8 firmware_version[129]; u8 firmware_version[129];
u8 assoc_rsp[256]; u8 assoc_rsp[256];
...@@ -38,7 +38,7 @@ struct wilc_cfg { ...@@ -38,7 +38,7 @@ struct wilc_cfg {
struct wilc_cfg_hword *hw; struct wilc_cfg_hword *hw;
struct wilc_cfg_word *w; struct wilc_cfg_word *w;
struct wilc_cfg_str *s; struct wilc_cfg_str *s;
struct wilc_mac_cfg *str_vals; struct wilc_cfg_str_vals *str_vals;
}; };
struct wilc; struct wilc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment