---

yaml --- r: 265476 b: refs/heads/master c: 2865785 h: refs/heads/master v: v3
git-mirror · Aug 9, 2011 · 2483bf4 · 2483bf4
1 parent 84b357f
commit 2483bf4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37ca63350709c9bdb273afda6a19f61b88572237
+refs/heads/master: 2865785e96b5990db6928126996fa246d399ec6d
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/init.c b/trunk/drivers/net/wireless/ath/ath6kl/init.c
@@ -1053,7 +1053,7 @@ static int ath6kl_init(struct net_device *dev)
 
 	/* Indicate that WMI is enabled (although not ready yet) */
 	set_bit(WMI_ENABLED, &ar->flag);
-	ar->wmi = ath6kl_wmi_init((void *) ar);
+	ar->wmi = ath6kl_wmi_init(ar);
 	if (!ar->wmi) {
 		ath6kl_err("failed to initialize wmi\n");
 		status = -EIO;

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/wmi.c b/trunk/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -2724,7 +2724,7 @@ static void ath6kl_wmi_qos_state_init(struct wmi *wmi)
 	spin_unlock_bh(&wmi->lock);
 }
 
-void *ath6kl_wmi_init(void *dev)
+void *ath6kl_wmi_init(struct ath6kl *dev)
 {
 	struct wmi *wmi;
 

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/wmi.h b/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -114,7 +114,7 @@ struct wmi {
 	bool ready;
 	u16 stream_exist_for_ac[WMM_NUM_AC];
 	u8 fat_pipe_exist;
-	void *parent_dev;
+	struct ath6kl *parent_dev;
 	struct wmi_stats stat;
 	struct ath6kl_node_table scan_table;
 	u8 bssid[ETH_ALEN];
@@ -2018,7 +2018,7 @@ int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u16 aid, bool flag);
 int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 rx_meta_version,
 				       bool rx_dot11_hdr, bool defrag_on_host);
 
-void *ath6kl_wmi_init(void *devt);
+void *ath6kl_wmi_init(struct ath6kl *devt);
 void ath6kl_wmi_shutdown(struct wmi *wmi);
 
 #endif /* WMI_H */