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

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

s390/qeth: pass full IQD header length to fill_buffer() 



This is a prerequisite for unifying the code to build header elements.
The TSO header has a different size, so we can no longer rely on implicitly
adding the size of a normal qeth_hdr.

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 9c3bfda9

drivers/s390/net/qeth_core_main.c

+1 −2
Original line number Diff line number Diff line
@@ -3981,8 +3981,7 @@ static int qeth_fill_buffer(struct qeth_qdio_out_q *queue, 
		is_first_elem = false;



		buffer->element[element].addr = hdr;

		buffer->element[element].length = sizeof(struct qeth_hdr) +

							hd_len;

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

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

		buf->is_header[element] = 1;

		buf->next_element_to_fill++;

drivers/s390/net/qeth_l2_main.c

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static int qeth_l2_xmit_iqd(struct qeth_card *card, struct sk_buff *skb, 
		goto out;

	}

	rc = qeth_do_send_packet_fast(card, queue, skb, hdr, data_offset,

				      data_offset);

				      sizeof(*hdr) + data_offset);

out:

	if (rc)

		kmem_cache_free(qeth_core_header_cache, hdr);

drivers/s390/net/qeth_l3_main.c

+2 −1
Original line number Diff line number Diff line
@@ -2670,6 +2670,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, 
	if (card->info.type == QETH_CARD_TYPE_IQD) {

		new_skb = skb;

		data_offset = ETH_HLEN;

		hd_len = sizeof(*hdr);

		hdr = kmem_cache_alloc(qeth_core_header_cache, GFP_ATOMIC);

		if (!hdr)

			goto tx_drop;
@@ -2771,7 +2772,7 @@ static netdev_tx_t qeth_l3_hard_start_xmit(struct sk_buff *skb, 
					 hd_len, elements);

	} else

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

					      data_offset, 0);

					      data_offset, hd_len);



	if (!rc) {

		card->stats.tx_packets++;