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: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 9d8557e7819db683ecefab756cfda93aa9f3fe60..1a29fecf0489cdbcc0ba47a9afe05ce4d68b52fa 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2119,7 +2119,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
 
        init_netdev(ndev);
 
-       ath6kl_init_control_info(ar);
+       ath6kl_init_control_info(vif);
 
        /* TODO: Pass interface specific pointer instead of ar */
        if (ath6kl_init_if_data(vif))

diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 4db0b15ec96bc130ecd357c7b9183879e5216833..de288ffe02c100217d6b08478589e8cae5506d1e 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -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_read(struct ath6kl *ar, u32 address, void *data, u32 length);
 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_stop_endpoint(struct net_device *dev, bool keep_profile,
                          bool get_dbglogs);
@@ -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_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_core_free(struct ath6kl *ar);
 #endif /* CORE_H */

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 65739573b2f90f6ca76bd64c7d01a14507a3a323..7968c2b751a55304fb1efd8c5fb73c6cb6dadad6 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -73,11 +73,8 @@ struct sk_buff *ath6kl_buf_alloc(int size)
        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;
        memset(vif->ssid, 0, sizeof(vif->ssid));
 
@@ -246,12 +243,9 @@ static int ath6kl_init_service_ep(struct ath6kl *ar)
        return 0;
 }
 
-void ath6kl_init_control_info(struct ath6kl *ar)
+void ath6kl_init_control_info(struct ath6kl_vif *vif)
 {
-       /* TODO: Findout vif */
-       struct ath6kl_vif *vif = ar->vif;
-
-       ath6kl_init_profile_info(ar);
+       ath6kl_init_profile_info(vif);
        vif->def_txkey_index = 0;
        memset(vif->wep_key_list, 0, sizeof(vif->wep_key_list));
        vif->ch_hint = 0;

diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 023624d9f01709ac64ffafc9d0efcb2482801074..08af257b6b412928feed02e6116c569777d011fc 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -443,7 +443,7 @@ void ath6kl_stop_endpoint(struct net_device *dev, bool keep_profile,
                                 test_bit(CONNECT_PEND, &vif->flags));
                ath6kl_disconnect(vif);
                if (!keep_profile)
-                       ath6kl_init_profile_info(ar);
+                       ath6kl_init_profile_info(vif);
 
                del_timer(&vif->disconnect_timer);
 
@@ -913,7 +913,7 @@ void disconnect_timer_handler(unsigned long ptr)
        struct net_device *dev = (struct net_device *)ptr;
        struct ath6kl_vif *vif = netdev_priv(dev);
 
-       ath6kl_init_profile_info(vif->ar);
+       ath6kl_init_profile_info(vif);
        ath6kl_disconnect(vif);
 }