| Message ID | 1313760467-8598-67-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
On 19 August 2011 14:27, Ian Campbell <ian.campbell@citrix.com> wrote: > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Cc: Greg Kroah-Hartman <gregkh@suse.de> > Cc: Mark Einon <mark.einon@gmail.com> > Cc: Alan Cox <alan@linux.intel.com> > Cc: devel@driverdev.osuosl.org > Cc: linux-kernel@vger.kernel.org > --- > 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 > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); } }
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Mark Einon <mark.einon@gmail.com> Cc: Alan Cox <alan@linux.intel.com> Cc: devel@driverdev.osuosl.org Cc: linux-kernel@vger.kernel.org --- drivers/staging/et131x/et1310_tx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)