Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 08:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath6kl: Moe virt_scat from hif_dev_scat_sup_info to hif_scatter_req

Browse Source 
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Vasanthakumar Thiagarajan 2011-07-16 20:29:15 +05:30 committed by Kalle Valo
parent cfeab10b11
commit 4a005c3ed0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath6kl/hif.h
View File

@ -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 {

6
drivers/net/wireless/ath/ath6kl/htc_hif.c
View File

@ -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,7 +285,7 @@ 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);
@ -293,7 +293,7 @@ int ath6kldev_submit_scat_req(struct ath6kl_device *dev,
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);
}

4
drivers/net/wireless/ath/ath6kl/sdio.c
View File

@ -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;
}