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

s390/qeth: shrink TX buffer struct 



Convert the large boolean array into a bitmap, this substantially
reduces the struct's size. While at it also clarify the naming.

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

drivers/s390/net/qeth_core.h

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ struct qeth_qdio_out_buffer { 
	unsigned int frames;

	unsigned int bytes;

	struct sk_buff_head skb_list;

	int is_header[QDIO_MAX_ELEMENTS_PER_BUFFER];

	DECLARE_BITMAP(from_kmem_cache, QDIO_MAX_ELEMENTS_PER_BUFFER);



	struct list_head list_entry;

	struct qaob *aob;

drivers/s390/net/qeth_core_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1347,9 +1347,8 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue, 
	for (i = 0; i < queue->max_elements; ++i) {

		void *data = phys_to_virt(buf->buffer->element[i].addr);



		if (data && buf->is_header[i])

		if (__test_and_clear_bit(i, buf->from_kmem_cache) && data)

			kmem_cache_free(qeth_core_header_cache, data);

		buf->is_header[i] = 0;

	}



	qeth_scrub_qdio_buffer(buf->buffer, queue->max_elements);
@@ -1393,7 +1392,7 @@ static void qeth_tx_complete_pending_bufs(struct qeth_card *card, 
			     i++) {

				void *data = phys_to_virt(aob->sba[i]);



				if (data && buf->is_header[i])

				if (test_bit(i, buf->from_kmem_cache) && data)

					kmem_cache_free(qeth_core_header_cache,

							data);

			}
@@ -4053,7 +4052,7 @@ static unsigned int qeth_fill_buffer(struct qeth_qdio_out_buffer *buf, 


		/* HW header is allocated from cache: */

		if ((void *)hdr != skb->data)

			buf->is_header[element] = 1;

			__set_bit(element, buf->from_kmem_cache);

		/* HW header was pushed and is contiguous with linear part: */

		else if (length > 0 && !PAGE_ALIGNED(data) &&

			 (data == (char *)hdr + hd_len))