Build fixes for skb_frag_size conversion

I missed a few places.  One is in some ifdeffed code which will probably
never be re-enabled; the others are in drivers which can't currently be
compiled on x86.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 211607986134dcfd3864c11ce4201967b6702707..70b00ae4ec383aa5584e6f52b80c549b587ca5e2 100644 (file)
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2580,10 +2580,9 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
                        slot = 0;
                }
 
-               tpd->iovec[slot].addr = dma_map_single(&he_dev->pci_dev->dev,
-                       (void *) page_address(frag->page) + frag->page_offset,
-                               frag->size, DMA_TO_DEVICE);
-               tpd->iovec[slot].len = frag->size;
+               tpd->iovec[slot].addr = skb_frag_dma_map(&he_dev->pci_dev->dev,
+                               frag, 0, skb_frag_size(frag), DMA_TO_DEVICE);
+               tpd->iovec[slot].len = skb_frag_size(frag);
                ++slot;
 
        }

diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 010a2f48aea539016225272f31ebbb53ed30c46c..2a9f8643629c0af8ea66047a5b1d005c341724d7 100644 (file)
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -110,7 +110,7 @@ static void greth_print_tx_packet(struct sk_buff *skb)
 
                print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,
                               skb_frag_address(&skb_shinfo(skb)->frags[i]),
-                              skb_shinfo(skb)->frags[i].size, true);
+                              skb_frag_size(&skb_shinfo(skb)->frags[i]), true);
        }
 }
 

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index f38c3fa7d70578cf15da9b56edcafda460beb340..9c4d1afa34e5128cee5cfc017ab2465f51987bdc 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -1958,7 +1958,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
        /* populate the rest of SGT entries */
        for (i = 0; i < nr_frags; i++) {
                frag = &skb_shinfo(skb)->frags[i];
-               frag_len = frag->size;
+               frag_len = skb_frag_size(frag);
                WARN_ON(!skb_frag_page(frag));
                addr = skb_frag_dma_map(dev, frag, 0,
                                        frag_len, dma_dir);

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 00991df44ed6fb0fbb948b64ca6aeb179c536a92..e529d86468b8138dbe02475240f4502d8ed9523d 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -787,7 +787,8 @@ static inline int mtk_cal_txd_req(struct sk_buff *skb)
        if (skb_is_gso(skb)) {
                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                        frag = &skb_shinfo(skb)->frags[i];
-                       nfrags += DIV_ROUND_UP(frag->size, MTK_TX_DMA_BUF_LEN);
+                       nfrags += DIV_ROUND_UP(skb_frag_size(frag),
+                                               MTK_TX_DMA_BUF_LEN);
                }
        } else {
                nfrags += skb_shinfo(skb)->nr_frags;

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index cc12c78f73f1c8d0472caba7c31146a51dbc9b94..46a6fcf1414d699f751e12392abf40d55bdc6ab9 100644 (file)
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 
                        hw_buffer.s.addr =
                                XKPHYS_TO_PHYS((u64)skb_frag_address(fs));
-                       hw_buffer.s.size = fs->size;
+                       hw_buffer.s.size = skb_drag_size(fs);
                        CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
                }
                hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb));

diff --git a/drivers/target/iscsi/cxgbit/cxgbit_target.c b/drivers/target/iscsi/cxgbit/cxgbit_target.c
index 93212b9fd31004f9aab3b902aa8cd0b5eb620a41..c25315431ad006a320b5666e3e9b6ac81015f892 100644 (file)
--- a/drivers/target/iscsi/cxgbit/cxgbit_target.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_target.c
@@ -1448,7 +1448,7 @@ cxgbit_lro_skb_merge(struct cxgbit_sock *csk, struct sk_buff *skb, u8 pdu_idx)
                hpdu_cb->frags++;
                hpdu_cb->hfrag_idx = hfrag_idx;
 
-               len = skb_frag_size(&hssi->frags[hfrag_idx]);;
+               len = skb_frag_size(&hssi->frags[hfrag_idx]);
                hskb->len += len;
                hskb->data_len += len;
                hskb->truesize += len;