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

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

drivers/atm/he.c

+3 −4
Original line number Diff line number Diff line
@@ -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;



	}

drivers/net/ethernet/aeroflex/greth.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/octeon/ethernet-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

CRA Git | Maintained and supported by SUSTech CRA and CCSE