Commit 2a200d6c authored by Adham Abozaeid's avatar Adham Abozaeid Committed by Greg Kroah-Hartman

staging: wilc1000: Don't keep a copy of wiphy parameters in the driver

host_if_drv.cfg_values is a write only member, and can be removed
Signed-off-by: default avatarAdham Abozaeid <adham.abozaeid@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6eb72073
...@@ -375,43 +375,31 @@ static void handle_cfg_param(struct work_struct *work) ...@@ -375,43 +375,31 @@ static void handle_cfg_param(struct work_struct *work)
mutex_lock(&hif_drv->cfg_values_lock); mutex_lock(&hif_drv->cfg_values_lock);
if (param->flag & RETRY_SHORT) { if (param->flag & RETRY_SHORT) {
u16 retry_limit = param->short_retry_limit;
wid_list[i].id = WID_SHORT_RETRY_LIMIT; wid_list[i].id = WID_SHORT_RETRY_LIMIT;
wid_list[i].val = (s8 *)&param->short_retry_limit; wid_list[i].val = (s8 *)&param->short_retry_limit;
wid_list[i].type = WID_SHORT; wid_list[i].type = WID_SHORT;
wid_list[i].size = sizeof(u16); wid_list[i].size = sizeof(u16);
hif_drv->cfg_values.short_retry_limit = retry_limit;
i++; i++;
} }
if (param->flag & RETRY_LONG) { if (param->flag & RETRY_LONG) {
u16 limit = param->long_retry_limit;
wid_list[i].id = WID_LONG_RETRY_LIMIT; wid_list[i].id = WID_LONG_RETRY_LIMIT;
wid_list[i].val = (s8 *)&param->long_retry_limit; wid_list[i].val = (s8 *)&param->long_retry_limit;
wid_list[i].type = WID_SHORT; wid_list[i].type = WID_SHORT;
wid_list[i].size = sizeof(u16); wid_list[i].size = sizeof(u16);
hif_drv->cfg_values.long_retry_limit = limit;
i++; i++;
} }
if (param->flag & FRAG_THRESHOLD) { if (param->flag & FRAG_THRESHOLD) {
u16 frag_th = param->frag_threshold;
wid_list[i].id = WID_FRAG_THRESHOLD; wid_list[i].id = WID_FRAG_THRESHOLD;
wid_list[i].val = (s8 *)&param->frag_threshold; wid_list[i].val = (s8 *)&param->frag_threshold;
wid_list[i].type = WID_SHORT; wid_list[i].type = WID_SHORT;
wid_list[i].size = sizeof(u16); wid_list[i].size = sizeof(u16);
hif_drv->cfg_values.frag_threshold = frag_th;
i++; i++;
} }
if (param->flag & RTS_THRESHOLD) { if (param->flag & RTS_THRESHOLD) {
u16 rts_th = param->rts_threshold;
wid_list[i].id = WID_RTS_THRESHOLD; wid_list[i].id = WID_RTS_THRESHOLD;
wid_list[i].val = (s8 *)&param->rts_threshold; wid_list[i].val = (s8 *)&param->rts_threshold;
wid_list[i].type = WID_SHORT; wid_list[i].type = WID_SHORT;
wid_list[i].size = sizeof(u16); wid_list[i].size = sizeof(u16);
hif_drv->cfg_values.rts_threshold = rts_th;
i++; i++;
} }
...@@ -3256,7 +3244,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler) ...@@ -3256,7 +3244,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
mutex_lock(&hif_drv->cfg_values_lock); mutex_lock(&hif_drv->cfg_values_lock);
hif_drv->hif_state = HOST_IF_IDLE; hif_drv->hif_state = HOST_IF_IDLE;
hif_drv->cfg_values.scan_source = DEFAULT_SCAN;
hif_drv->p2p_timeout = 0; hif_drv->p2p_timeout = 0;
......
...@@ -293,7 +293,6 @@ struct host_if_drv { ...@@ -293,7 +293,6 @@ struct host_if_drv {
enum host_if_state hif_state; enum host_if_state hif_state;
u8 assoc_bssid[ETH_ALEN]; u8 assoc_bssid[ETH_ALEN];
struct cfg_param_attr cfg_values;
/*lock to protect concurrent setting of cfg params*/ /*lock to protect concurrent setting of cfg params*/
struct mutex cfg_values_lock; struct mutex cfg_values_lock;
......
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