linux-kernel - [PATCH 07/11] net/ks8842: add context parameter to prep_slave

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu,  2 Feb 2012 16:32:17 -0500
From:	Alexandre Bounine <alexandre.bounine@....com>
To:	vinod.koul@...el.com, dan.j.williams@...el.com,
	linux-kernel@...r.kernel.org
Cc:	Alexandre Bounine <alexandre.bounine@....com>,
	"David S. Miller" <davem@...emloft.net>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Dennis Aberilla <denzzzhome@...oo.com>,
	Alexey Dobriyan <adobriyan@...il.com>,
	Wan ZongShun <mcuos.com@...il.com>
Subject: [PATCH 07/11] net/ks8842: add context parameter to prep_slave_sg call

Fixups for calls affected by adding the new context parameter to DMA_SLAVE
and DMA_CYCLIC interfaces.

Signed-off-by: Alexandre Bounine <alexandre.bounine@....com>
Cc: David S. Miller <davem@...emloft.net>
Cc: Samuel Ortiz <sameo@...ux.intel.com>
Cc: Dennis Aberilla <denzzzhome@...oo.com>
Cc: Alexey Dobriyan <adobriyan@...il.com>
Cc: Wan ZongShun <mcuos.com@...il.com>
---
 drivers/net/ethernet/micrel/ks8842.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0a85690..afc6b57 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -460,7 +460,7 @@ static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)
 
 	ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
 		&ctl->sg, 1, DMA_MEM_TO_DEV,
-		DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+		DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP, NULL);
 	if (!ctl->adesc)
 		return NETDEV_TX_BUSY;
 
@@ -572,7 +572,7 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)
 
 		ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
 			sg, 1, DMA_DEV_TO_MEM,
-			DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
+			DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP, NULL);
 
 		if (!ctl->adesc)
 			goto out;
-- 
1.7.8.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/