diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-02 19:47:50 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-02 19:47:50 +0200 |
commit | 406a94d7fae94a893c3afb9c2d18c83124d3cd9b (patch) | |
tree | c81f4de219ff9309a3f8f60c7855a620b8598ef4 /drivers/net/wireless/ath/ath6kl/hif.c | |
parent | hyperv: Enable sendbuf mechanism on the send path (diff) | |
parent | rsi: Changing opcode for sta mode according to changes in firmware (diff) | |
download | linux-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.tar.xz linux-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/hif.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/hif.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c index fea7709b5dda..18c070850a09 100644 --- a/drivers/net/wireless/ath/ath6kl/hif.c +++ b/drivers/net/wireless/ath/ath6kl/hif.c @@ -37,7 +37,6 @@ static int ath6kl_hif_cp_scat_dma_buf(struct hif_scatter_req *req, buf = req->virt_dma_buf; for (i = 0; i < req->scat_entries; i++) { - if (from_dma) memcpy(req->scat_list[i].buf, buf, req->scat_list[i].len); @@ -116,7 +115,6 @@ static void ath6kl_hif_dump_fw_crash(struct ath6kl *ar) le32_to_cpu(regdump_val[i + 2]), le32_to_cpu(regdump_val[i + 3])); } - } static int ath6kl_hif_proc_dbg_intr(struct ath6kl_device *dev) @@ -701,5 +699,4 @@ int ath6kl_hif_setup(struct ath6kl_device *dev) fail_setup: return status; - } |