diff options
| -rw-r--r-- | drivers/net/ibmveth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 91ec9fdc7184..a03fe1fb61ca 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -260,7 +260,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc | |||
| 260 | dma_addr = dma_map_single(&adapter->vdev->dev, skb->data, | 260 | dma_addr = dma_map_single(&adapter->vdev->dev, skb->data, |
| 261 | pool->buff_size, DMA_FROM_DEVICE); | 261 | pool->buff_size, DMA_FROM_DEVICE); |
| 262 | 262 | ||
| 263 | if (dma_mapping_error((&adapter->vdev->dev, dma_addr)) | 263 | if (dma_mapping_error(&adapter->vdev->dev, dma_addr)) |
| 264 | goto failure; | 264 | goto failure; |
| 265 | 265 | ||
| 266 | pool->free_map[free_index] = IBM_VETH_INVALID_MAP; | 266 | pool->free_map[free_index] = IBM_VETH_INVALID_MAP; |
| @@ -294,7 +294,7 @@ failure: | |||
| 294 | pool->consumer_index = pool->size - 1; | 294 | pool->consumer_index = pool->size - 1; |
| 295 | else | 295 | else |
| 296 | pool->consumer_index--; | 296 | pool->consumer_index--; |
| 297 | if (!dma_mapping_error((&adapter->vdev->dev, dma_addr)) | 297 | if (!dma_mapping_error(&adapter->vdev->dev, dma_addr)) |
| 298 | dma_unmap_single(&adapter->vdev->dev, | 298 | dma_unmap_single(&adapter->vdev->dev, |
| 299 | pool->dma_addr[index], pool->buff_size, | 299 | pool->dma_addr[index], pool->buff_size, |
| 300 | DMA_FROM_DEVICE); | 300 | DMA_FROM_DEVICE); |
| @@ -488,7 +488,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter) | |||
| 488 | &adapter->rx_buff_pool[i]); | 488 | &adapter->rx_buff_pool[i]); |
| 489 | 489 | ||
| 490 | if (adapter->bounce_buffer != NULL) { | 490 | if (adapter->bounce_buffer != NULL) { |
| 491 | if (!dma_mapping_error(adapter->bounce_buffer_dma)) { | 491 | if (!dma_mapping_error(dev, adapter->bounce_buffer_dma)) { |
| 492 | dma_unmap_single(&adapter->vdev->dev, | 492 | dma_unmap_single(&adapter->vdev->dev, |
| 493 | adapter->bounce_buffer_dma, | 493 | adapter->bounce_buffer_dma, |
| 494 | adapter->netdev->mtu + IBMVETH_BUFF_OH, | 494 | adapter->netdev->mtu + IBMVETH_BUFF_OH, |
| @@ -924,7 +924,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
| 924 | buf[1] = 0; | 924 | buf[1] = 0; |
| 925 | } | 925 | } |
| 926 | 926 | ||
| 927 | if (dma_mapping_error((&adapter->vdev->dev, data_dma_addr)) { | 927 | if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) { |
| 928 | if (!firmware_has_feature(FW_FEATURE_CMO)) | 928 | if (!firmware_has_feature(FW_FEATURE_CMO)) |
| 929 | ibmveth_error_printk("tx: unable to map xmit buffer\n"); | 929 | ibmveth_error_printk("tx: unable to map xmit buffer\n"); |
| 930 | skb_copy_from_linear_data(skb, adapter->bounce_buffer, | 930 | skb_copy_from_linear_data(skb, adapter->bounce_buffer, |
