Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d73a6c3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Finish-conversion-of-skb_frag_t-to-bio_vec' 



Jonathan Lemon says:

====================
Finish conversion of skb_frag_t to bio_vec

The recent conversion of skb_frag_t to bio_vec did not include
skb_frag's page_offset.  Add accessor functions for this field,
utilize them, and remove the union, restoring the original structure.

v2:
  - rename accessors
  - follow kdoc conventions
====================

Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6ca04afb 65c84f14

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */ 
			else

				put_dma(tx->index,eni_dev->dma,&j,(unsigned long)

				    skb_frag_page(&skb_shinfo(skb)->frags[i]) +

					skb_shinfo(skb)->frags[i].page_offset,

					skb_frag_off(&skb_shinfo(skb)->frags[i]),

				    skb_frag_size(&skb_shinfo(skb)->frags[i]));

	}

	if (skb->len & 3) {

drivers/hsi/clients/ssi_protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void ssip_skb_to_msg(struct sk_buff *skb, struct hsi_msg *msg) 
		BUG_ON(!sg);

		frag = &skb_shinfo(skb)->frags[i];

		sg_set_page(sg, skb_frag_page(frag), skb_frag_size(frag),

				frag->page_offset);

				skb_frag_off(frag));

	}

}

drivers/infiniband/hw/hfi1/vnic_sdma.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde, 
		ret = sdma_txadd_page(sde->dd,

				      &tx->txreq,

				      skb_frag_page(frag),

				      frag->page_offset,

				      skb_frag_off(frag),

				      skb_frag_size(frag));

		if (unlikely(ret))

			goto bail_txadd;

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ int ipoib_dma_map_tx(struct ib_device *ca, struct ipoib_tx_buf *tx_req) 
		const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

		mapping[i + off] = ib_dma_map_page(ca,

						 skb_frag_page(frag),

						 frag->page_offset, skb_frag_size(frag),

						 skb_frag_off(frag),

						 skb_frag_size(frag),

						 DMA_TO_DEVICE);

		if (unlikely(ib_dma_mapping_error(ca, mapping[i + off])))

			goto partial_error;

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp, 


	frag = &skb_shinfo(skb)->frags[0];

	skb_frag_size_sub(frag, payload);

	frag->page_offset += payload;

	skb_frag_off_add(frag, payload);

	skb->data_len -= payload;

	skb->tail += payload;