Merge tag 'pci-v5.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / drivers / net / ethernet / cavium / liquidio / lio_vf_main.c

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index ac821c5..f6396ac 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -843,7 +843,7 @@ static void free_netsgbuf(void *buf)
        while (frags--) {
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
 
-               pci_unmap_page((lio->oct_dev)->pci_dev,
+               dma_unmap_page(&lio->oct_dev->pci_dev->dev,
                               g->sg[(i >> 2)].ptr[(i & 3)],
                               skb_frag_size(frag), DMA_TO_DEVICE);
                i++;
@@ -887,7 +887,7 @@ static void free_netsgbuf_with_resp(void *buf)
        while (frags--) {
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
 
-               pci_unmap_page((lio->oct_dev)->pci_dev,
+               dma_unmap_page(&lio->oct_dev->pci_dev->dev,
                               g->sg[(i >> 2)].ptr[(i & 3)],
                               skb_frag_size(frag), DMA_TO_DEVICE);
                i++;
@@ -1889,7 +1889,7 @@ static const struct net_device_ops lionetdevops = {
        .ndo_vlan_rx_add_vid    = liquidio_vlan_rx_add_vid,
        .ndo_vlan_rx_kill_vid   = liquidio_vlan_rx_kill_vid,
        .ndo_change_mtu         = liquidio_change_mtu,
-       .ndo_do_ioctl           = liquidio_ioctl,
+       .ndo_eth_ioctl          = liquidio_ioctl,
        .ndo_fix_features       = liquidio_fix_features,
        .ndo_set_features       = liquidio_set_features,
 };