On 19 August 2011 14:27, Ian Campbell <ian.campbell@xxxxxxxxxx> wrote: > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> > Cc: Mark Einon <mark.einon@xxxxxxxxx> > Cc: Alan Cox <alan@xxxxxxxxxxxxxxx> > Cc: devel@xxxxxxxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > --- > drivers/staging/et131x/et1310_tx.c | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) Just a heads up - This patch is going to create some merge issues if/when the outstanding changes I've sent for inclusion in the staging tree get merged back. Should be fairly trivial to fix though. Cheers, Mark > > diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c > index 8fb3051..03e7a4e 100644 > --- a/drivers/staging/et131x/et1310_tx.c > +++ b/drivers/staging/et131x/et1310_tx.c > @@ -519,12 +519,12 @@ static int nic_send_packet(struct et131x_adapter *etdev, struct tcb *tcb) > * returned by pci_map_page() is always 32-bit > * addressable (as defined by the pci/dma subsystem) > */ > - desc[frag++].addr_lo = > - pci_map_page(etdev->pdev, > - frags[i - 1].page, > - frags[i - 1].page_offset, > - frags[i - 1].size, > - PCI_DMA_TODEVICE); > + desc[frag++].addr_lo = skb_frag_dma_map( > + &etdev->pdev->dev, > + &frags[i - 1], > + 0, > + frags[i - 1].size, > + PCI_DMA_TODEVICE); > } > } > > -- > 1.7.2.5 > > _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
