提交 e29f25f5 编写于 作者: V Vasanthakumar Thiagarajan 提交者: Kalle Valo

ath6kl: Cleanup parameters in ath6kl_init_control_info() and ath6kl_init_profile_info()

Pass vif structure to those functions instead of ath6kl because these
functions do vif specific information initialization.
Signed-off-by: NVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
上级 28ae58dd
...@@ -2119,7 +2119,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, ...@@ -2119,7 +2119,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
init_netdev(ndev); init_netdev(ndev);
ath6kl_init_control_info(ar); ath6kl_init_control_info(vif);
/* TODO: Pass interface specific pointer instead of ar */ /* TODO: Pass interface specific pointer instead of ar */
if (ath6kl_init_if_data(vif)) if (ath6kl_init_if_data(vif))
......
...@@ -602,7 +602,7 @@ int ath6kl_diag_write(struct ath6kl *ar, u32 address, void *data, u32 length); ...@@ -602,7 +602,7 @@ int ath6kl_diag_write(struct ath6kl *ar, u32 address, void *data, u32 length);
int ath6kl_diag_read32(struct ath6kl *ar, u32 address, u32 *value); int ath6kl_diag_read32(struct ath6kl *ar, u32 address, u32 *value);
int ath6kl_diag_read(struct ath6kl *ar, u32 address, void *data, u32 length); int ath6kl_diag_read(struct ath6kl *ar, u32 address, void *data, u32 length);
int ath6kl_read_fwlogs(struct ath6kl *ar); int ath6kl_read_fwlogs(struct ath6kl *ar);
void ath6kl_init_profile_info(struct ath6kl *ar); void ath6kl_init_profile_info(struct ath6kl_vif *vif);
void ath6kl_tx_data_cleanup(struct ath6kl *ar); void ath6kl_tx_data_cleanup(struct ath6kl *ar);
void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile, void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile,
bool get_dbglogs); bool get_dbglogs);
...@@ -657,7 +657,7 @@ void aggr_recv_addba_req_evt(struct ath6kl_vif *vif, u8 tid, u16 seq_no, ...@@ -657,7 +657,7 @@ void aggr_recv_addba_req_evt(struct ath6kl_vif *vif, u8 tid, u16 seq_no,
void ath6kl_wakeup_event(void *dev); void ath6kl_wakeup_event(void *dev);
void ath6kl_target_failure(struct ath6kl *ar); void ath6kl_target_failure(struct ath6kl *ar);
void ath6kl_init_control_info(struct ath6kl *ar); void ath6kl_init_control_info(struct ath6kl_vif *vif);
void ath6kl_deinit_if_data(struct ath6kl_vif *vif); void ath6kl_deinit_if_data(struct ath6kl_vif *vif);
void ath6kl_core_free(struct ath6kl *ar); void ath6kl_core_free(struct ath6kl *ar);
#endif /* CORE_H */ #endif /* CORE_H */
...@@ -73,11 +73,8 @@ struct sk_buff *ath6kl_buf_alloc(int size) ...@@ -73,11 +73,8 @@ struct sk_buff *ath6kl_buf_alloc(int size)
return skb; return skb;
} }
void ath6kl_init_profile_info(struct ath6kl *ar) void ath6kl_init_profile_info(struct ath6kl_vif *vif)
{ {
/* TODO: Findout vif */
struct ath6kl_vif *vif = ar->vif;
vif->ssid_len = 0; vif->ssid_len = 0;
memset(vif->ssid, 0, sizeof(vif->ssid)); memset(vif->ssid, 0, sizeof(vif->ssid));
...@@ -246,12 +243,9 @@ static int ath6kl_init_service_ep(struct ath6kl *ar) ...@@ -246,12 +243,9 @@ static int ath6kl_init_service_ep(struct ath6kl *ar)
return 0; return 0;
} }
void ath6kl_init_control_info(struct ath6kl *ar) void ath6kl_init_control_info(struct ath6kl_vif *vif)
{ {
/* TODO: Findout vif */ ath6kl_init_profile_info(vif);
struct ath6kl_vif *vif = ar->vif;
ath6kl_init_profile_info(ar);
vif->def_txkey_index = 0; vif->def_txkey_index = 0;
memset(vif->wep_key_list, 0, sizeof(vif->wep_key_list)); memset(vif->wep_key_list, 0, sizeof(vif->wep_key_list));
vif->ch_hint = 0; vif->ch_hint = 0;
......
...@@ -443,7 +443,7 @@ void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile, ...@@ -443,7 +443,7 @@ void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile,
test_bit(CONNECT_PEND, &vif->flags)); test_bit(CONNECT_PEND, &vif->flags));
ath6kl_disconnect(vif); ath6kl_disconnect(vif);
if (!keep_profile) if (!keep_profile)
ath6kl_init_profile_info(ar); ath6kl_init_profile_info(vif);
del_timer(&vif->disconnect_timer); del_timer(&vif->disconnect_timer);
...@@ -913,7 +913,7 @@ void disconnect_timer_handler(unsigned long ptr) ...@@ -913,7 +913,7 @@ void disconnect_timer_handler(unsigned long ptr)
struct net_device *dev = (struct net_device *)ptr; struct net_device *dev = (struct net_device *)ptr;
struct ath6kl_vif *vif = netdev_priv(dev); struct ath6kl_vif *vif = netdev_priv(dev);
ath6kl_init_profile_info(vif->ar); ath6kl_init_profile_info(vif);
ath6kl_disconnect(vif); ath6kl_disconnect(vif);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册