diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_nic.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 9d7ffebff213..96cb35a8e317 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
| @@ -441,11 +441,11 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev) | |||
| 441 | nesnic->tx_skb[nesnic->sq_head] = skb; | 441 | nesnic->tx_skb[nesnic->sq_head] = skb; |
| 442 | for (skb_fragment_index = 0; skb_fragment_index < skb_shinfo(skb)->nr_frags; | 442 | for (skb_fragment_index = 0; skb_fragment_index < skb_shinfo(skb)->nr_frags; |
| 443 | skb_fragment_index++) { | 443 | skb_fragment_index++) { |
| 444 | bus_address = pci_map_page( nesdev->pcidev, | 444 | skb_frag_t *frag = |
| 445 | skb_shinfo(skb)->frags[skb_fragment_index].page, | 445 | &skb_shinfo(skb)->frags[skb_fragment_index]; |
| 446 | skb_shinfo(skb)->frags[skb_fragment_index].page_offset, | 446 | bus_address = skb_frag_dma_map(&nesdev->pcidev->dev, |
| 447 | skb_shinfo(skb)->frags[skb_fragment_index].size, | 447 | frag, 0, frag->size, |
| 448 | PCI_DMA_TODEVICE); | 448 | PCI_DMA_TODEVICE); |
| 449 | wqe_fragment_length[wqe_fragment_index] = | 449 | wqe_fragment_length[wqe_fragment_index] = |
| 450 | cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size); | 450 | cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size); |
| 451 | set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index), | 451 | set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index), |
| @@ -561,11 +561,12 @@ tso_sq_no_longer_full: | |||
| 561 | /* Map all the buffers */ | 561 | /* Map all the buffers */ |
| 562 | for (tso_frag_count=0; tso_frag_count < skb_shinfo(skb)->nr_frags; | 562 | for (tso_frag_count=0; tso_frag_count < skb_shinfo(skb)->nr_frags; |
| 563 | tso_frag_count++) { | 563 | tso_frag_count++) { |
| 564 | tso_bus_address[tso_frag_count] = pci_map_page( nesdev->pcidev, | 564 | skb_frag_t *frag = |
| 565 | skb_shinfo(skb)->frags[tso_frag_count].page, | 565 | &skb_shinfo(skb)->frags[tso_frag_count]; |
| 566 | skb_shinfo(skb)->frags[tso_frag_count].page_offset, | 566 | tso_bus_address[tso_frag_count] = |
| 567 | skb_shinfo(skb)->frags[tso_frag_count].size, | 567 | skb_frag_dma_map(&nesdev->pcidev->dev, |
| 568 | PCI_DMA_TODEVICE); | 568 | frag, 0, frag->size, |
| 569 | PCI_DMA_TODEVICE); | ||
| 569 | } | 570 | } |
| 570 | 571 | ||
| 571 | tso_frag_index = 0; | 572 | tso_frag_index = 0; |
| @@ -1638,7 +1639,7 @@ static const struct net_device_ops nes_netdev_ops = { | |||
| 1638 | .ndo_get_stats = nes_netdev_get_stats, | 1639 | .ndo_get_stats = nes_netdev_get_stats, |
| 1639 | .ndo_tx_timeout = nes_netdev_tx_timeout, | 1640 | .ndo_tx_timeout = nes_netdev_tx_timeout, |
| 1640 | .ndo_set_mac_address = nes_netdev_set_mac_address, | 1641 | .ndo_set_mac_address = nes_netdev_set_mac_address, |
| 1641 | .ndo_set_multicast_list = nes_netdev_set_multicast_list, | 1642 | .ndo_set_rx_mode = nes_netdev_set_multicast_list, |
| 1642 | .ndo_change_mtu = nes_netdev_change_mtu, | 1643 | .ndo_change_mtu = nes_netdev_change_mtu, |
| 1643 | .ndo_validate_addr = eth_validate_addr, | 1644 | .ndo_validate_addr = eth_validate_addr, |
| 1644 | .ndo_fix_features = nes_fix_features, | 1645 | .ndo_fix_features = nes_fix_features, |