Commit e56a48b1 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

[PATCH] PPC64 iSeries virtual ethernet fix

This patch is needed due to other patches that were applied in parallel
with the inclusion of the iSeries virtual ethernet driver.
parent 766ab5a1
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/pci.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
...@@ -78,10 +77,11 @@ ...@@ -78,10 +77,11 @@
#include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/HvLpEvent.h> #include <asm/iSeries/HvLpEvent.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/vio.h>
#include "iseries_veth.h" #include "iseries_veth.h"
extern struct pci_dev *iSeries_veth_dev; extern struct vio_dev *iSeries_veth_dev;
MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>"); MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>");
MODULE_DESCRIPTION("iSeries Virtual ethernet driver"); MODULE_DESCRIPTION("iSeries Virtual ethernet driver");
...@@ -895,10 +895,10 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp, ...@@ -895,10 +895,10 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
} }
dma_length = skb->len; dma_length = skb->len;
dma_address = pci_map_single(iSeries_veth_dev, skb->data, dma_address = vio_map_single(iSeries_veth_dev, skb->data,
dma_length, PCI_DMA_TODEVICE); dma_length, DMA_TO_DEVICE);
if (pci_dma_mapping_error(dma_address)) if (dma_mapping_error(dma_address))
goto recycle_and_drop; goto recycle_and_drop;
/* Is it really necessary to check the length and address /* Is it really necessary to check the length and address
...@@ -1016,8 +1016,8 @@ static void veth_recycle_msg(struct veth_lpar_connection *cnx, ...@@ -1016,8 +1016,8 @@ static void veth_recycle_msg(struct veth_lpar_connection *cnx,
dma_address = msg->data.addr[0]; dma_address = msg->data.addr[0];
dma_length = msg->data.len[0]; dma_length = msg->data.len[0];
pci_unmap_single(iSeries_veth_dev, dma_address, dma_length, vio_unmap_single(iSeries_veth_dev, dma_address, dma_length,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
if (msg->skb) { if (msg->skb) {
dev_kfree_skb_any(msg->skb); dev_kfree_skb_any(msg->skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment