8 files changed, 26 insertions, 24 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 444470a28de2..6a8f36e9d9ed 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -802,11 +802,9 @@ static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                         skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
                         maplen = frag->size;
-                        mapaddr =
-                            pci_map_page(c2dev->pcidev, frag->page,
-                                         frag->page_offset, maplen,
-                                         PCI_DMA_TODEVICE);
-
+                        mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag,
+                                                   0, maplen,
+                                                   PCI_DMA_TODEVICE);
                         elem = elem->next;
                         elem->skb = NULL;
                         elem->mapaddr = mapaddr;
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
index 621619c794e5..2761364185af 100644
--- a/drivers/infiniband/hw/cxgb3/Makefile
+++ b/drivers/infiniband/hw/cxgb3/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb3
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
 
diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
index cd20b1342aec..46b878ca2c3b 100644
--- a/drivers/infiniband/hw/cxgb4/Makefile
+++ b/drivers/infiniband/hw/cxgb4/Makefile
@@ -1,4 +1,4 @@
-ccflags-y := -Idrivers/net/cxgb4
+ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
 
diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
index bd995b2b50d8..24ab11a9ad1e 100644
--- a/drivers/infiniband/hw/mlx4/Kconfig
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@ -1,6 +1,7 @@
 config MLX4_INFINIBAND
         tristate "Mellanox ConnectX HCA support"
-        depends on NETDEVICES && NETDEV_10000 && PCI
+        depends on NETDEVICES && ETHERNET && PCI
+        select NET_VENDOR_MELLANOX
         select MLX4_CORE
         ---help---
           This driver provides low-level InfiniBand support for
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)
                 nesnic->tx_skb[nesnic->sq_head] = skb;
                 for (skb_fragment_index = 0; skb_fragment_index < skb_shinfo(skb)->nr_frags;
                                 skb_fragment_index++) {
-                        bus_address = pci_map_page( nesdev->pcidev,
-                                        skb_shinfo(skb)->frags[skb_fragment_index].page,
-                                        skb_shinfo(skb)->frags[skb_fragment_index].page_offset,
-                                        skb_shinfo(skb)->frags[skb_fragment_index].size,
-                                        PCI_DMA_TODEVICE);
+                        skb_frag_t *frag =
+                                &skb_shinfo(skb)->frags[skb_fragment_index];
+                        bus_address = skb_frag_dma_map(&nesdev->pcidev->dev,
+                                                       frag, 0, frag->size,
+                                                       PCI_DMA_TODEVICE);
                         wqe_fragment_length[wqe_fragment_index] =
                                         cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size);
                         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:
                         /* Map all the buffers */
                         for (tso_frag_count=0; tso_frag_count < skb_shinfo(skb)->nr_frags;
                                         tso_frag_count++) {
-                                tso_bus_address[tso_frag_count] = pci_map_page( nesdev->pcidev,
-                                                skb_shinfo(skb)->frags[tso_frag_count].page,
-                                                skb_shinfo(skb)->frags[tso_frag_count].page_offset,
-                                                skb_shinfo(skb)->frags[tso_frag_count].size,
-                                                PCI_DMA_TODEVICE);
+                                skb_frag_t *frag =
+                                        &skb_shinfo(skb)->frags[tso_frag_count];
+                                tso_bus_address[tso_frag_count] =
+                                        skb_frag_dma_map(&nesdev->pcidev->dev,
+                                                         frag, 0, frag->size,
+                                                         PCI_DMA_TODEVICE);
                         }
 
                         tso_frag_index = 0;
@@ -1638,7 +1639,7 @@ static const struct net_device_ops nes_netdev_ops = {
         .ndo_get_stats          = nes_netdev_get_stats,
         .ndo_tx_timeout         = nes_netdev_tx_timeout,
         .ndo_set_mac_address    = nes_netdev_set_mac_address,
-        .ndo_set_multicast_list = nes_netdev_set_multicast_list,
+        .ndo_set_rx_mode        = nes_netdev_set_multicast_list,
         .ndo_change_mtu         = nes_netdev_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_fix_features       = nes_fix_features,
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 39913a065f99..67a477be237e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -169,7 +169,7 @@ static struct sk_buff *ipoib_cm_alloc_rx_skb(struct net_device *dev,
                         goto partial_error;
                 skb_fill_page_desc(skb, i, page, 0, PAGE_SIZE);
 
-                mapping[i + 1] = ib_dma_map_page(priv->ca, skb_shinfo(skb)->frags[i].page,
+                mapping[i + 1] = ib_dma_map_page(priv->ca, page,
                                                  0, PAGE_SIZE, DMA_FROM_DEVICE);
                 if (unlikely(ib_dma_mapping_error(priv->ca, mapping[i + 1])))
                         goto partial_error;
@@ -537,7 +537,8 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space,
 
                 if (length == 0) {
                         /* don't need this page */
-                        skb_fill_page_desc(toskb, i, frag->page, 0, PAGE_SIZE);
+                        skb_fill_page_desc(toskb, i, skb_frag_page(frag),
+                                           0, PAGE_SIZE);
                         --skb_shinfo(skb)->nr_frags;
                 } else {
                         size = min(length, (unsigned) PAGE_SIZE);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 81ae61d68a22..00435be4a44b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -182,7 +182,7 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id)
                         goto partial_error;
                 skb_fill_page_desc(skb, 0, page, 0, PAGE_SIZE);
                 mapping[1] =
-                        ib_dma_map_page(priv->ca, skb_shinfo(skb)->frags[0].page,
+                        ib_dma_map_page(priv->ca, page,
                                         0, PAGE_SIZE, DMA_FROM_DEVICE);
                 if (unlikely(ib_dma_mapping_error(priv->ca, mapping[1])))
                         goto partial_error;
@@ -323,7 +323,8 @@ static int ipoib_dma_map_tx(struct ib_device *ca,
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; ++i) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                mapping[i + off] = ib_dma_map_page(ca, frag->page,
+                mapping[i + off] = ib_dma_map_page(ca,
+                                                 skb_frag_page(frag),
                                                  frag->page_offset, frag->size,
                                                  DMA_TO_DEVICE);
                 if (unlikely(ib_dma_mapping_error(ca, mapping[i + off])))
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index fe89c4660d55..7567b6000230 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -998,7 +998,7 @@ static const struct net_device_ops ipoib_netdev_ops = {
         .ndo_fix_features        = ipoib_fix_features,
         .ndo_start_xmit          = ipoib_start_xmit,
         .ndo_tx_timeout          = ipoib_timeout,
-        .ndo_set_multicast_list  = ipoib_set_mcast_list,
+        .ndo_set_rx_mode         = ipoib_set_mcast_list,
         .ndo_neigh_setup         = ipoib_neigh_setup_dev,
 };