Commit 761b331c authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: tso: cache transport header length 



Add tlen field into struct tso_t, and change tso_start()
to return skb_transport_offset(skb) + tso->tlen

This removes from callers the need to use tcp_hdrlen(skb) and
will ease UDP segmentation offload addition.

v2: calls tso_start() earlier in otx2_sq_append_tso() [Jakub]

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 504b9121

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+3 −2
Original line number Diff line number Diff line
@@ -1489,9 +1489,10 @@ static int nicvf_sq_append_tso(struct nicvf *nic, struct snd_queue *sq, 
	int seg_subdescs = 0, desc_cnt = 0;

	int seg_len, total_len, data_left;

	int hdr_qentry = qentry;

	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

	int hdr_len;



	hdr_len = tso_start(skb, &tso);



	tso_start(skb, &tso);

	total_len = skb->len - hdr_len;

	while (total_len > 0) {

		char *hdr;

drivers/net/ethernet/freescale/fec_main.c

+2 −3
Original line number Diff line number Diff line
@@ -710,8 +710,7 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq, 
				   struct net_device *ndev)

{

	struct fec_enet_private *fep = netdev_priv(ndev);

	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

	int total_len, data_left;

	int hdr_len, total_len, data_left;

	struct bufdesc *bdp = txq->bd.cur;

	struct tso_t tso;

	unsigned int index = 0;
@@ -731,7 +730,7 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq, 
	}



	/* Initialize the TSO handler, and prepare the first payload */

	tso_start(skb, &tso);

	hdr_len = tso_start(skb, &tso);



	total_len = skb->len - hdr_len;

	while (total_len > 0) {

drivers/net/ethernet/marvell/mv643xx_eth.c

+2 −3
Original line number Diff line number Diff line
@@ -816,10 +816,9 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb, 
			  struct net_device *dev)

{

	struct mv643xx_eth_private *mp = txq_to_mp(txq);

	int total_len, data_left, ret;

	int hdr_len, total_len, data_left, ret;

	int desc_count = 0;

	struct tso_t tso;

	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

	struct tx_desc *first_tx_desc;

	u32 first_cmd_sts = 0;
@@ -832,7 +831,7 @@ static int txq_submit_tso(struct tx_queue *txq, struct sk_buff *skb, 
	first_tx_desc = &txq->tx_desc_area[txq->tx_curr_desc];



	/* Initialize the TSO handler, and prepare the first payload */

	tso_start(skb, &tso);

	hdr_len = tso_start(skb, &tso);



	total_len = skb->len - hdr_len;

	while (total_len > 0) {

drivers/net/ethernet/marvell/mvneta.c

+2 −3
Original line number Diff line number Diff line
@@ -2604,11 +2604,10 @@ mvneta_tso_put_data(struct net_device *dev, struct mvneta_tx_queue *txq, 
static int mvneta_tx_tso(struct sk_buff *skb, struct net_device *dev,

			 struct mvneta_tx_queue *txq)

{

	int total_len, data_left;

	int hdr_len, total_len, data_left;

	int desc_count = 0;

	struct mvneta_port *pp = netdev_priv(dev);

	struct tso_t tso;

	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

	int i;



	/* Count needed descriptors */
@@ -2621,7 +2620,7 @@ static int mvneta_tx_tso(struct sk_buff *skb, struct net_device *dev, 
	}



	/* Initialize the TSO handler, and prepare the first payload */

	tso_start(skb, &tso);

	hdr_len = tso_start(skb, &tso);



	total_len = skb->len - hdr_len;

	while (total_len > 0) {

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+3 −3
Original line number Diff line number Diff line
@@ -3160,9 +3160,8 @@ static int mvpp2_tx_tso(struct sk_buff *skb, struct net_device *dev, 
			struct mvpp2_txq_pcpu *txq_pcpu)

{

	struct mvpp2_port *port = netdev_priv(dev);

	int hdr_sz, i, len, descs = 0;

	struct tso_t tso;

	int hdr_sz = skb_transport_offset(skb) + tcp_hdrlen(skb);

	int i, len, descs = 0;



	/* Check number of available descriptors */

	if (mvpp2_aggr_desc_num_check(port, aggr_txq, tso_count_descs(skb)) ||
@@ -3170,7 +3169,8 @@ static int mvpp2_tx_tso(struct sk_buff *skb, struct net_device *dev, 
					     tso_count_descs(skb)))

		return 0;



	tso_start(skb, &tso);

	hdr_sz = tso_start(skb, &tso);



	len = skb->len - hdr_sz;

	while (len > 0) {

		int left = min_t(int, skb_shinfo(skb)->gso_size, len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE