---

yaml --- r: 278137 b: refs/heads/master c: fee005e h: refs/heads/master i: 278135: 79b0b12 v: v3
git-mirror · Nov 15, 2011 · bcff2a0 · bcff2a0
1 parent f9e891e
commit bcff2a0
Show file tree

Hide file tree

Showing 61 changed files with 2,429 additions and 4,939 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3bea1c8751d297c197949db01aa1e7adbc1104d
+refs/heads/master: fee005e5dd82a43546c1b1beb187e82415360940
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/Makefile b/trunk/drivers/net/wireless/ath/ath6kl/Makefile
@@ -23,7 +23,7 @@
 
 obj-$(CONFIG_ATH6KL) := ath6kl.o
 ath6kl-y += debug.o
-ath6kl-y += hif.o
+ath6kl-y += htc_hif.o
 ath6kl-y += htc.o
 ath6kl-y += bmi.o
 ath6kl-y += cfg80211.o

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/bmi.c b/trunk/drivers/net/wireless/ath/ath6kl/bmi.c
@@ -196,6 +196,8 @@ int ath6kl_bmi_done(struct ath6kl *ar)
 		return ret;
 	}
 
+	ath6kl_bmi_cleanup(ar);
+
 	return 0;
 }
 
@@ -670,11 +672,6 @@ int ath6kl_bmi_fast_download(struct ath6kl *ar, u32 addr, u8 *buf, u32 len)
 	return ret;
 }
 
-void ath6kl_bmi_reset(struct ath6kl *ar)
-{
-	ar->bmi.done_sent = false;
-}
-
 int ath6kl_bmi_init(struct ath6kl *ar)
 {
 	ar->bmi.cmd_buf = kzalloc(MAX_BMI_CMDBUF_SZ, GFP_ATOMIC);

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/bmi.h b/trunk/drivers/net/wireless/ath/ath6kl/bmi.h
@@ -230,8 +230,6 @@ struct ath6kl_bmi_target_info {
 
 int ath6kl_bmi_init(struct ath6kl *ar);
 void ath6kl_bmi_cleanup(struct ath6kl *ar);
-void ath6kl_bmi_reset(struct ath6kl *ar);
-
 int ath6kl_bmi_done(struct ath6kl *ar);
 int ath6kl_bmi_get_target_info(struct ath6kl *ar,
 			       struct ath6kl_bmi_target_info *targ_info);