From patchwork Fri Jul 22 05:41:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 998272 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6M5igtV024204 for ; Fri, 22 Jul 2011 05:44:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258Ab1GVFok (ORCPT ); Fri, 22 Jul 2011 01:44:40 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:37995 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753051Ab1GVFok (ORCPT ); Fri, 22 Jul 2011 01:44:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=kvalo@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1311313479; x=1342849479; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; z=From:=20Kalle=20Valo=20|To:=20|CC:=20,=20Vasanthakumar=20Thiagarajan=0D=0A=09|Subject:=20[PATCH=2011/31]=20ath6kl:=20Moe =20virt_scat=20from=20hif_dev_scat_sup_info=20to=20hif_sc atter_req|Date:=20Fri,=2022=20Jul=202011=2008:41:44=20+03 00|Message-ID:=20<1311313324-6766-13-git-send-email-kvalo @qca.qualcomm.com>|In-Reply-To:=20<1311313324-6766-1-git- send-email-kvalo@qca.qualcomm.com>|References:=20<1311313 324-6766-1-git-send-email-kvalo@qca.qualcomm.com> |MIME-Version:=201.0; bh=mXlag1ddAZVfXeqQDHApahP9Cbio9BH7lEh7zETBLiE=; b=OSNCrY+QuN4oR+Jea2NsV+A10wRtyWTYP9JU1kGq2HNS1Nu0Zlh3tCu8 xOQR5gL/Ao3/iMY+mgaHoHfPx2qtemswg5nM6E8UL5woSDsnLCVjV4Dan VzAU5K4en5UqGlpW+p6O6T+GLFxeBIDJE2Bi6C+VU7jbOPjgxnFOnHJtc 0=; X-IronPort-AV: E=McAfee;i="5400,1158,6414"; a="104991867" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine02.qualcomm.com with ESMTP; 21 Jul 2011 22:44:39 -0700 X-IronPort-AV: E=Sophos;i="4.67,244,1309762800"; d="scan'208";a="96719741" Received: from nasanexhc06.na.qualcomm.com ([172.30.48.21]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/AES128-SHA; 21 Jul 2011 22:44:39 -0700 Received: from NASJOEXHC01.na.qualcomm.com (172.30.48.1) by nasanexhc06.na.qualcomm.com (172.30.48.21) with Microsoft SMTP Server (TLS) id 14.1.323.0; Thu, 21 Jul 2011 22:42:53 -0700 Received: from localhost.localdomain (10.234.11.69) by qcamail1.atheros.com (10.234.56.15) with Microsoft SMTP Server (TLS) id 14.1.323.0; Thu, 21 Jul 2011 22:42:52 -0700 From: Kalle Valo To: CC: , Vasanthakumar Thiagarajan Subject: [PATCH 11/31] ath6kl: Moe virt_scat from hif_dev_scat_sup_info to hif_scatter_req Date: Fri, 22 Jul 2011 08:41:44 +0300 Message-ID: <1311313324-6766-13-git-send-email-kvalo@qca.qualcomm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311313324-6766-1-git-send-email-kvalo@qca.qualcomm.com> References: <1311313324-6766-1-git-send-email-kvalo@qca.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.234.11.69] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 22 Jul 2011 05:44:42 +0000 (UTC) From: Vasanthakumar Thiagarajan Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath6kl/hif.h | 3 ++- drivers/net/wireless/ath/ath6kl/htc_hif.c | 6 +++--- drivers/net/wireless/ath/ath6kl/sdio.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h index 6e0ec4a..abb1095 100644 --- a/drivers/net/wireless/ath/ath6kl/hif.h +++ b/drivers/net/wireless/ath/ath6kl/hif.h @@ -169,6 +169,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; @@ -185,7 +187,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/drivers/net/wireless/ath/ath6kl/htc_hif.c b/drivers/net/wireless/ath/ath6kl/htc_hif.c index 33887cc..44bee90 100644 --- a/drivers/net/wireless/ath/ath6kl/htc_hif.c +++ b/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,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); } diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index 96a112e..686f091 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/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; }