Commit 92493a2f authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by David S. Miller

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f75ec1a
...@@ -2580,10 +2580,9 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) ...@@ -2580,10 +2580,9 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
slot = 0; slot = 0;
} }
tpd->iovec[slot].addr = dma_map_single(&he_dev->pci_dev->dev, tpd->iovec[slot].addr = skb_frag_dma_map(&he_dev->pci_dev->dev,
(void *) page_address(frag->page) + frag->page_offset, frag, 0, skb_frag_size(frag), DMA_TO_DEVICE);
frag->size, DMA_TO_DEVICE); tpd->iovec[slot].len = skb_frag_size(frag);
tpd->iovec[slot].len = frag->size;
++slot; ++slot;
} }
......
...@@ -110,7 +110,7 @@ static void greth_print_tx_packet(struct sk_buff *skb) ...@@ -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, print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,
skb_frag_address(&skb_shinfo(skb)->frags[i]), skb_frag_address(&skb_shinfo(skb)->frags[i]),
skb_shinfo(skb)->frags[i].size, true); skb_frag_size(&skb_shinfo(skb)->frags[i]), true);
} }
} }
......
...@@ -1958,7 +1958,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv, ...@@ -1958,7 +1958,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
/* populate the rest of SGT entries */ /* populate the rest of SGT entries */
for (i = 0; i < nr_frags; i++) { for (i = 0; i < nr_frags; i++) {
frag = &skb_shinfo(skb)->frags[i]; frag = &skb_shinfo(skb)->frags[i];
frag_len = frag->size; frag_len = skb_frag_size(frag);
WARN_ON(!skb_frag_page(frag)); WARN_ON(!skb_frag_page(frag));
addr = skb_frag_dma_map(dev, frag, 0, addr = skb_frag_dma_map(dev, frag, 0,
frag_len, dma_dir); frag_len, dma_dir);
......
...@@ -787,7 +787,8 @@ static inline int mtk_cal_txd_req(struct sk_buff *skb) ...@@ -787,7 +787,8 @@ static inline int mtk_cal_txd_req(struct sk_buff *skb)
if (skb_is_gso(skb)) { if (skb_is_gso(skb)) {
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
frag = &skb_shinfo(skb)->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 { } else {
nfrags += skb_shinfo(skb)->nr_frags; nfrags += skb_shinfo(skb)->nr_frags;
......
...@@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
hw_buffer.s.addr = hw_buffer.s.addr =
XKPHYS_TO_PHYS((u64)skb_frag_address(fs)); 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; CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
} }
hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb)); hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb));
......
...@@ -1448,7 +1448,7 @@ cxgbit_lro_skb_merge(struct cxgbit_sock *csk, struct sk_buff *skb, u8 pdu_idx) ...@@ -1448,7 +1448,7 @@ cxgbit_lro_skb_merge(struct cxgbit_sock *csk, struct sk_buff *skb, u8 pdu_idx)
hpdu_cb->frags++; hpdu_cb->frags++;
hpdu_cb->hfrag_idx = hfrag_idx; 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->len += len;
hskb->data_len += len; hskb->data_len += len;
hskb->truesize += len; hskb->truesize += len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment