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

Commit 13ddacb5 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: pass TSO header length to fill_buffer() 



The TSO code already calculates the length of its header element,
no need to duplicate this in the low-level code again.

Use this opportunity to make hd_len unsigned, and for TSO match
its calculation to what tso_fill_header() does.

No functional change.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae79fe03

drivers/s390/net/qeth_core.h

+4 −3
Original line number Diff line number Diff line
@@ -949,9 +949,10 @@ int qeth_get_elements_for_frags(struct sk_buff *); 
int qeth_do_send_packet_fast(struct qeth_card *card,

			     struct qeth_qdio_out_q *queue, struct sk_buff *skb,

			     struct qeth_hdr *hdr, unsigned int offset,

			     int hd_len);

int qeth_do_send_packet(struct qeth_card *, struct qeth_qdio_out_q *,

		    struct sk_buff *, struct qeth_hdr *, int);

			     unsigned int hd_len);

int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,

			struct sk_buff *skb, struct qeth_hdr *hdr,

			unsigned int hd_len, int elements);

int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

int qeth_core_get_sset_count(struct net_device *, int);

void qeth_core_get_ethtool_stats(struct net_device *,

drivers/s390/net/qeth_core_main.c

+8 −10
Original line number Diff line number Diff line
@@ -3956,11 +3956,11 @@ static void __qeth_fill_buffer(struct sk_buff *skb, 
static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,

			    struct qeth_qdio_out_buffer *buf,

			    struct sk_buff *skb, struct qeth_hdr *hdr,

			    unsigned int offset, int hd_len)

			    unsigned int offset, unsigned int hd_len)

{

	struct qdio_buffer *buffer;

	int flush_cnt = 0, hdr_len;

	bool is_first_elem = true;

	int flush_cnt = 0;



	buffer = buf->buffer;

	refcount_inc(&skb->users);
@@ -3970,14 +3970,12 @@ static int qeth_fill_buffer(struct qeth_qdio_out_q *queue, 
		int element = buf->next_element_to_fill;

		is_first_elem = false;



		hdr_len = sizeof(struct qeth_hdr_tso) +

			((struct qeth_hdr_tso *)hdr)->ext.dg_hdr_len;

		/*fill first buffer entry only with header information */

		buffer->element[element].addr = skb->data;

		buffer->element[element].length = hdr_len;

		buffer->element[element].length = hd_len;

		buffer->element[element].eflags = SBAL_EFLAGS_FIRST_FRAG;

		buf->next_element_to_fill++;

		skb_pull(skb, hdr_len);

		skb_pull(skb, hd_len);

	}



	/* IQD */
@@ -4020,7 +4018,7 @@ static int qeth_fill_buffer(struct qeth_qdio_out_q *queue, 
int qeth_do_send_packet_fast(struct qeth_card *card,

			     struct qeth_qdio_out_q *queue, struct sk_buff *skb,

			     struct qeth_hdr *hdr, unsigned int offset,

			     int hd_len)

			     unsigned int hd_len)

{

	struct qeth_qdio_out_buffer *buffer;

	int index;
@@ -4051,7 +4049,7 @@ EXPORT_SYMBOL_GPL(qeth_do_send_packet_fast); 


int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,

			struct sk_buff *skb, struct qeth_hdr *hdr,

		int elements_needed)

			unsigned int hd_len, int elements_needed)

{

	struct qeth_qdio_out_buffer *buffer;

	int start_index;
@@ -4100,7 +4098,7 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue, 
			}

		}

	}

	tmp = qeth_fill_buffer(queue, buffer, skb, hdr, 0, 0);

	tmp = qeth_fill_buffer(queue, buffer, skb, hdr, 0, hd_len);

	queue->next_buf_to_fill = (queue->next_buf_to_fill + tmp) %

				  QDIO_MAX_BUFFERS_PER_Q;

	flush_count += tmp;

drivers/s390/net/qeth_l2_main.c

+2 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static int qeth_l2_xmit_osa(struct qeth_card *card, struct sk_buff *skb, 
		rc = -EINVAL;

		goto out;

	}

	rc = qeth_do_send_packet(card, queue, skb_copy, hdr, elements);

	rc = qeth_do_send_packet(card, queue, skb_copy, hdr, 0, elements);

out:

	if (!rc) {

		/* tx success, free dangling original */
@@ -778,7 +778,7 @@ static int qeth_l2_xmit_osn(struct qeth_card *card, struct sk_buff *skb, 
		return -E2BIG;

	if (qeth_hdr_chk_and_bounce(skb, &hdr, sizeof(*hdr)))

		return -EINVAL;

	return qeth_do_send_packet(card, queue, skb, hdr, elements);

	return qeth_do_send_packet(card, queue, skb, hdr, 0, elements);

}



static netdev_tx_t qeth_l2_hard_start_xmit(struct sk_buff *skb,

drivers/s390/net/qeth_l3_main.c

+9 −6
Original line number Diff line number Diff line
@@ -2637,6 +2637,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, 
			qeth_get_priority_queue(card, skb, ipv, cast_type) :

			card->qdio.default_out_queue];

	int tx_bytes = skb->len;

	unsigned int hd_len = 0;

	bool use_tso;

	int data_offset = -1;

	unsigned int nr_frags;
@@ -2756,16 +2757,18 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, 


	if (card->info.type != QETH_CARD_TYPE_IQD) {

		int len;

		if (use_tso)

			len = ((unsigned long)tcp_hdr(new_skb) +

				tcp_hdrlen(new_skb)) -

				(unsigned long)new_skb->data;

		else

		if (use_tso) {

			hd_len = sizeof(struct qeth_hdr_tso) +

				 ip_hdrlen(new_skb) + tcp_hdrlen(new_skb);

			len = hd_len;

		} else {

			len = sizeof(struct qeth_hdr_layer3);

		}



		if (qeth_hdr_chk_and_bounce(new_skb, &hdr, len))

			goto tx_drop;

		rc = qeth_do_send_packet(card, queue, new_skb, hdr, elements);

		rc = qeth_do_send_packet(card, queue, new_skb, hdr, hd_len,

					 elements);

	} else

		rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr,

					      data_offset, 0);