---

yaml --- r: 265458 b: refs/heads/master c: ca06cad h: refs/heads/master v: v3
git-mirror · Aug 9, 2011 · 4cd41f4 · 4cd41f4
1 parent 27cefd5
commit 4cd41f4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 348a8fbce79e15b1918390120c0d63baa85343a0
+refs/heads/master: ca06cadb732955fae377b435c83e3746123a71ac
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc.c b/trunk/drivers/net/wireless/ath/ath6kl/htc.c
@@ -2175,7 +2175,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)
 	target->msg_per_bndl_max = min(HTC_HOST_MAX_MSG_PER_BUNDLE,
 				       target->msg_per_bndl_max);
 
-	if (ath6kldev_setup_msg_bndl(target->dev, target->msg_per_bndl_max)) {
+	if (ath6kl_hif_enable_scatter(target->dev->ar, scat_info)) {
 		target->msg_per_bndl_max = 0;
 		return;
 	}

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
@@ -216,11 +216,6 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
 	return status;
 }
 
-int ath6kldev_setup_msg_bndl(struct ath6kl_device *dev, int max_msg_per_trans)
-{
-	return ath6kl_hif_enable_scatter(dev->ar, &dev->hif_scat_info);
-}
-
 static int ath6kldev_proc_counter_intr(struct ath6kl_device *dev)
 {
 	u8 counter_int_status;

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.h b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.h
@@ -103,7 +103,6 @@ int ath6kldev_rw_comp_handler(void *context, int status);
 int ath6kldev_intr_bh_handler(struct ath6kl *ar);
 
 /* Scatter Function and Definitions */
-int ath6kldev_setup_msg_bndl(struct ath6kl_device *dev, int max_msg_per_xfer);
 int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
 			    struct hif_scatter_req *scat_req, bool read);