1 files changed, 29 insertions, 29 deletions

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 676c513e12fc..e0b47cc8a86e 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -64,6 +64,7 @@
 #include <linux/moduleparam.h>
 #include <linux/io.h>
 #include <linux/log2.h>
+#include <linux/slab.h>
 #include <net/checksum.h>
 #include <net/ip.h>
 #include <net/tcp.h>
@@ -109,15 +110,15 @@ MODULE_LICENSE("Dual BSD/GPL");
 struct myri10ge_rx_buffer_state {
         struct page *page;
         int page_offset;
-         DECLARE_PCI_UNMAP_ADDR(bus)
-         DECLARE_PCI_UNMAP_LEN(len)
+        DEFINE_DMA_UNMAP_ADDR(bus);
+        DEFINE_DMA_UNMAP_LEN(len);
 };
 
 struct myri10ge_tx_buffer_state {
         struct sk_buff *skb;
         int last;
-         DECLARE_PCI_UNMAP_ADDR(bus)
-         DECLARE_PCI_UNMAP_LEN(len)
+        DEFINE_DMA_UNMAP_ADDR(bus);
+        DEFINE_DMA_UNMAP_LEN(len);
 };
 
 struct myri10ge_cmd {
@@ -1233,7 +1234,7 @@ myri10ge_alloc_rx_pages(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
                 rx->info[idx].page_offset = rx->page_offset;
                 /* note that this is the address of the start of the
                  * page */
-                pci_unmap_addr_set(&rx->info[idx], bus, rx->bus);
+                dma_unmap_addr_set(&rx->info[idx], bus, rx->bus);
                 rx->shadow[idx].addr_low =
                     htonl(MYRI10GE_LOWPART_TO_U32(rx->bus) + rx->page_offset);
                 rx->shadow[idx].addr_high =
@@ -1265,7 +1266,7 @@ myri10ge_unmap_rx_page(struct pci_dev *pdev,
         /* unmap the recvd page if we're the only or last user of it */
         if (bytes >= MYRI10GE_ALLOC_SIZE / 2 ||
             (info->page_offset + 2 * bytes) > MYRI10GE_ALLOC_SIZE) {
-                pci_unmap_page(pdev, (pci_unmap_addr(info, bus)
+                pci_unmap_page(pdev, (dma_unmap_addr(info, bus)
                                       & ~(MYRI10GE_ALLOC_SIZE - 1)),
                                MYRI10GE_ALLOC_SIZE, PCI_DMA_FROMDEVICE);
         }
@@ -1372,21 +1373,21 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
                         tx->info[idx].last = 0;
                 }
                 tx->done++;
-                len = pci_unmap_len(&tx->info[idx], len);
-                pci_unmap_len_set(&tx->info[idx], len, 0);
+                len = dma_unmap_len(&tx->info[idx], len);
+                dma_unmap_len_set(&tx->info[idx], len, 0);
                 if (skb) {
                         ss->stats.tx_bytes += skb->len;
                         ss->stats.tx_packets++;
                         dev_kfree_skb_irq(skb);
                         if (len)
                                 pci_unmap_single(pdev,
-                                                 pci_unmap_addr(&tx->info[idx],
+                                                 dma_unmap_addr(&tx->info[idx],
                                                                 bus), len,
                                                  PCI_DMA_TODEVICE);
                 } else {
                         if (len)
                                 pci_unmap_page(pdev,
-                                               pci_unmap_addr(&tx->info[idx],
+                                               dma_unmap_addr(&tx->info[idx],
                                                               bus), len,
                                                PCI_DMA_TODEVICE);
                 }
@@ -1689,7 +1690,7 @@ myri10ge_set_pauseparam(struct net_device *netdev,
         if (pause->tx_pause != mgp->pause)
                 return myri10ge_change_pause(mgp, pause->tx_pause);
         if (pause->rx_pause != mgp->pause)
-                return myri10ge_change_pause(mgp, pause->tx_pause);
+                return myri10ge_change_pause(mgp, pause->rx_pause);
         if (pause->autoneg != 0)
                 return -EINVAL;
         return 0;
@@ -2093,20 +2094,20 @@ static void myri10ge_free_rings(struct myri10ge_slice_state *ss)
                 /* Mark as free */
                 tx->info[idx].skb = NULL;
                 tx->done++;
-                len = pci_unmap_len(&tx->info[idx], len);
-                pci_unmap_len_set(&tx->info[idx], len, 0);
+                len = dma_unmap_len(&tx->info[idx], len);
+                dma_unmap_len_set(&tx->info[idx], len, 0);
                 if (skb) {
                         ss->stats.tx_dropped++;
                         dev_kfree_skb_any(skb);
                         if (len)
                                 pci_unmap_single(mgp->pdev,
-                                                 pci_unmap_addr(&tx->info[idx],
+                                                 dma_unmap_addr(&tx->info[idx],
                                                                 bus), len,
                                                  PCI_DMA_TODEVICE);
                 } else {
                         if (len)
                                 pci_unmap_page(mgp->pdev,
-                                               pci_unmap_addr(&tx->info[idx],
+                                               dma_unmap_addr(&tx->info[idx],
                                                               bus), len,
                                                PCI_DMA_TODEVICE);
                 }
@@ -2756,12 +2757,12 @@ again:
         }
 
         /* map the skb for DMA */
-        len = skb->len - skb->data_len;
+        len = skb_headlen(skb);
         idx = tx->req & tx->mask;
         tx->info[idx].skb = skb;
         bus = pci_map_single(mgp->pdev, skb->data, len, PCI_DMA_TODEVICE);
-        pci_unmap_addr_set(&tx->info[idx], bus, bus);
-        pci_unmap_len_set(&tx->info[idx], len, len);
+        dma_unmap_addr_set(&tx->info[idx], bus, bus);
+        dma_unmap_len_set(&tx->info[idx], len, len);
 
         frag_cnt = skb_shinfo(skb)->nr_frags;
         frag_idx = 0;
@@ -2864,8 +2865,8 @@ again:
                 len = frag->size;
                 bus = pci_map_page(mgp->pdev, frag->page, frag->page_offset,
                                    len, PCI_DMA_TODEVICE);
-                pci_unmap_addr_set(&tx->info[idx], bus, bus);
-                pci_unmap_len_set(&tx->info[idx], len, len);
+                dma_unmap_addr_set(&tx->info[idx], bus, bus);
+                dma_unmap_len_set(&tx->info[idx], len, len);
         }
 
         (req - rdma_count)->rdma_count = rdma_count;
@@ -2902,19 +2903,19 @@ abort_linearize:
         idx = tx->req & tx->mask;
         tx->info[idx].skb = NULL;
         do {
-                len = pci_unmap_len(&tx->info[idx], len);
+                len = dma_unmap_len(&tx->info[idx], len);
                 if (len) {
                         if (tx->info[idx].skb != NULL)
                                 pci_unmap_single(mgp->pdev,
-                                                 pci_unmap_addr(&tx->info[idx],
+                                                 dma_unmap_addr(&tx->info[idx],
                                                                 bus), len,
                                                  PCI_DMA_TODEVICE);
                         else
                                 pci_unmap_page(mgp->pdev,
-                                               pci_unmap_addr(&tx->info[idx],
+                                               dma_unmap_addr(&tx->info[idx],
                                                               bus), len,
                                                PCI_DMA_TODEVICE);
-                        pci_unmap_len_set(&tx->info[idx], len, 0);
+                        dma_unmap_len_set(&tx->info[idx], len, 0);
                         tx->info[idx].skb = NULL;
                 }
                 idx = (idx + 1) & tx->mask;
@@ -3001,7 +3002,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
 {
         struct myri10ge_priv *mgp = netdev_priv(dev);
         struct myri10ge_cmd cmd;
-        struct dev_mc_list *mc_list;
+        struct netdev_hw_addr *ha;
         __be32 data[2] = { 0, 0 };
         int err;
 
@@ -3038,8 +3039,8 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
         }
 
         /* Walk the multicast list, and add each address */
-        netdev_for_each_mc_addr(mc_list, dev) {
-                memcpy(data, &mc_list->dmi_addr, 6);
+        netdev_for_each_mc_addr(ha, dev) {
+                memcpy(data, &ha->addr, 6);
                 cmd.data0 = ntohl(data[0]);
                 cmd.data1 = ntohl(data[1]);
                 err = myri10ge_send_cmd(mgp, MXGEFW_JOIN_MULTICAST_GROUP,
@@ -3047,7 +3048,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
 
                 if (err != 0) {
                         netdev_err(dev, "Failed MXGEFW_JOIN_MULTICAST_GROUP, error status:%d %pM\n",
-                                   err, mc_list->dmi_addr);
+                                   err, ha->addr);
                         goto abort;
                 }
         }
@@ -3687,7 +3688,6 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp)
         if (status != 0) {
                 dev_err(&mgp->pdev->dev, "failed reset\n");
                 goto abort_with_fw;
-                return;
         }
 
         mgp->max_intr_slots = cmd.data0 / sizeof(struct mcp_slot);