Skip to content

Commit 9f49443

Browse files
julianwiedmannVasily Gorbik
authored andcommitted
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: Julian Wiedmann <[email protected]> Reviewed-by: Benjamin Block <[email protected]> Reviewed-by: Jens Remus <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent e14e59c commit 9f49443

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

arch/s390/include/asm/qdio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct qib {
111111
/* private: */
112112
u8 res[88];
113113
/* public: */
114-
u8 parm[QDIO_MAX_BUFFERS_PER_Q];
114+
u8 parm[128];
115115
} __attribute__ ((packed, aligned(256)));
116116

117117
/**

drivers/s390/cio/qdio_setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static void set_impl_params(struct qdio_irq *irq_ptr,
113113
irq_ptr->qib.pfmt = qib_param_field_format;
114114
if (qib_param_field)
115115
memcpy(irq_ptr->qib.parm, qib_param_field,
116-
QDIO_MAX_BUFFERS_PER_Q);
116+
sizeof(irq_ptr->qib.parm));
117117

118118
if (!input_slib_elements)
119119
goto output;

drivers/s390/net/qeth_core_main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4715,8 +4715,7 @@ static int qeth_qdio_establish(struct qeth_card *card)
47154715

47164716
QETH_CARD_TEXT(card, 2, "qdioest");
47174717

4718-
qib_param_field = kzalloc(QDIO_MAX_BUFFERS_PER_Q,
4719-
GFP_KERNEL);
4718+
qib_param_field = kzalloc(FIELD_SIZEOF(struct qib, parm), GFP_KERNEL);
47204719
if (!qib_param_field) {
47214720
rc = -ENOMEM;
47224721
goto out_free_nothing;

0 commit comments

Comments
 (0)