---

yaml --- r: 265455 b: refs/heads/master c: 4a005c3 h: refs/heads/master i: 265453: 4a1099f 265451: 6526a2f 265447: 3a41b6a 265439: cecdcdb v: v3
git-mirror · Aug 9, 2011 · 5b4f646 · 5b4f646
1 parent 3d5a991
commit 5b4f646
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfeab10b117cee7c2b3a8aaf1dc49d28482aeca0
+refs/heads/master: 4a005c3ed0e6424e991daeea385bd08a9b97b67a
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/hif.h b/trunk/drivers/net/wireless/ath/ath6kl/hif.h
@@ -171,6 +171,8 @@ struct hif_scatter_req {
 	/* total length of entire transfer */
 	u32 len;
 
+	bool virt_scat;
+
 	void (*complete) (struct htc_target *, struct hif_scatter_req *);
 	int status;
 	int scat_entries;
@@ -187,7 +189,6 @@ struct hif_scatter_req {
 struct hif_dev_scat_sup_info {
 	int max_scat_entries;
 	int max_xfer_szper_scatreq;
-	bool virt_scat;
 };
 
 struct ath6kl_hif_ops {

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c b/trunk/drivers/net/wireless/ath/ath6kl/htc_hif.c
@@ -273,7 +273,7 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
 		   scat_req->addr, !read ? "async" : "sync",
 		   (read) ? "rd" : "wr");
 
-	if (!read && dev->hif_scat_info.virt_scat)
+	if (!read && scat_req->virt_scat)
 		status = ath6kldev_cp_scat_dma_buf(scat_req, false);
 
 	if (status) {
@@ -285,15 +285,15 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
 		return status;
 	}
 
-	if (dev->hif_scat_info.virt_scat)
+	if (scat_req->virt_scat)
 		status =  ath6kldev_rw_scatter(dev->ar, scat_req);
 	else
 		status = ath6kl_hif_scat_req_rw(dev->ar, scat_req);
 
 	if (read) {
 		/* in sync mode, we can touch the scatter request */
 		scat_req->status = status;
-		if (!status && dev->hif_scat_info.virt_scat)
+		if (!status && scat_req->virt_scat)
 			scat_req->status =
 				ath6kldev_cp_scat_dma_buf(scat_req, true);
 	}

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/sdio.c b/trunk/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -325,6 +325,8 @@ static int ath6kl_sdio_alloc_prep_scat_req(struct ath6kl_sdio *ar_sdio,
 		bus_req->scat_req = s_req;
 		s_req->busrequest = bus_req;
 
+		s_req->virt_scat = virt_scat;
+
 		/* add it to the scatter pool */
 		hif_scatter_req_add(ar_sdio->ar, s_req);
 	}
@@ -694,8 +696,6 @@ static int ath6kl_sdio_enable_scatter(struct ath6kl *ar,
 					ATH6KL_MAX_TRANSFER_SIZE_PER_SCATTER;
 	}
 
-	pinfo->virt_scat = virt_scat;
-
 	return 0;
 }