Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

qeth: fix some trace formating issues

This patch fixes trace formatting issues using the
QETH_CARD_TEXT_ macro. The total size of each trace entry
is 8 bytes. Some of the sprintf formats exceed these 8
bytes (for example using abcd:%d and the converted value
needs more than 3 bytes). The solution is to shorten the
text prepending the value or use a different format (%x).

Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Thomas Richter and committed by
David S. Miller
8a593148 bca51650

+5 -5
+3 -3
drivers/s390/net/qeth_core_main.c
··· 4134 4134 4135 4135 qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd); 4136 4136 if (cmd->hdr.return_code) { 4137 - QETH_CARD_TEXT_(card, 4, "prmrc%2.2x", cmd->hdr.return_code); 4137 + QETH_CARD_TEXT_(card, 4, "prmrc%x", cmd->hdr.return_code); 4138 4138 setparms->data.mode = SET_PROMISC_MODE_OFF; 4139 4139 } 4140 4140 card->info.promisc_mode = setparms->data.mode; ··· 4501 4501 snmp = &cmd->data.setadapterparms.data.snmp; 4502 4502 4503 4503 if (cmd->hdr.return_code) { 4504 - QETH_CARD_TEXT_(card, 4, "scer1%i", cmd->hdr.return_code); 4504 + QETH_CARD_TEXT_(card, 4, "scer1%x", cmd->hdr.return_code); 4505 4505 return 0; 4506 4506 } 4507 4507 if (cmd->data.setadapterparms.hdr.return_code) { 4508 4508 cmd->hdr.return_code = 4509 4509 cmd->data.setadapterparms.hdr.return_code; 4510 - QETH_CARD_TEXT_(card, 4, "scer2%i", cmd->hdr.return_code); 4510 + QETH_CARD_TEXT_(card, 4, "scer2%x", cmd->hdr.return_code); 4511 4511 return 0; 4512 4512 } 4513 4513 data_len = *((__u16 *)QETH_IPA_PDU_LEN_PDU1(data));
+1 -1
drivers/s390/net/qeth_l2_main.c
··· 1512 1512 1513 1513 QETH_CARD_TEXT(card, 2, "brstchng"); 1514 1514 if (qports->entry_length != sizeof(struct qeth_sbp_port_entry)) { 1515 - QETH_CARD_TEXT_(card, 2, "BPsz%.8d", qports->entry_length); 1515 + QETH_CARD_TEXT_(card, 2, "BPsz%04x", qports->entry_length); 1516 1516 return; 1517 1517 } 1518 1518 extrasize = sizeof(struct qeth_sbp_port_entry) * qports->num_entries;
+1 -1
drivers/s390/net/qeth_l3_main.c
··· 2502 2502 rc = -EFAULT; 2503 2503 goto free_and_out; 2504 2504 } 2505 - QETH_CARD_TEXT_(card, 4, "qacts"); 2505 + QETH_CARD_TEXT(card, 4, "qacts"); 2506 2506 } 2507 2507 free_and_out: 2508 2508 kfree(qinfo.udata);