Commit 9f494438 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Vasily Gorbik
Browse files

s390/qdio: clarify size of the QIB parm area 



The QIB parm area is 128 bytes long. Current code consistently misuses
an _entirely unrelated_ QDIO constant, merely because it has the same
value. Stop doing so.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Reviewed-by: default avatarJens Remus <jremus@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent e14e59c1

arch/s390/include/asm/qdio.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct qib { 
	/* private: */

	u8 res[88];

	/* public: */

	u8 parm[QDIO_MAX_BUFFERS_PER_Q];

	u8 parm[128];

} __attribute__ ((packed, aligned(256)));



/**

drivers/s390/cio/qdio_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static void set_impl_params(struct qdio_irq *irq_ptr, 
	irq_ptr->qib.pfmt = qib_param_field_format;

	if (qib_param_field)

		memcpy(irq_ptr->qib.parm, qib_param_field,

		       QDIO_MAX_BUFFERS_PER_Q);

		       sizeof(irq_ptr->qib.parm));



	if (!input_slib_elements)

		goto output;

drivers/s390/net/qeth_core_main.c

+1 −2
Original line number Diff line number Diff line
@@ -4715,8 +4715,7 @@ static int qeth_qdio_establish(struct qeth_card *card) 


	QETH_CARD_TEXT(card, 2, "qdioest");



	qib_param_field = kzalloc(QDIO_MAX_BUFFERS_PER_Q,

				  GFP_KERNEL);

	qib_param_field = kzalloc(FIELD_SIZEOF(struct qib, parm), GFP_KERNEL);

	if (!qib_param_field) {

		rc =  -ENOMEM;

		goto out_free_nothing;

CRA Git | Maintained and supported by SUSTech CRA and CCSE