aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2010-06-21 18:57:05 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-23 16:16:34 -0400
commit847a50fd9f3d6a1ee8c8bf646aa8c9a61ea51550 (patch)
tree730f6c00c0969be930ad7306fbc36796416331b8 /drivers/s390
parentaf039068ca43e29d29ca1b387cb0b3e10eae3b92 (diff)
qeth: Fold qeth_trace debug area
This patch removes the qeth_trace debug area. All relevant data is logged into either qeth_setup or into each card's own debug area. Superfluous information (such as the card number when logging into the card's own debug area) is removed without replacement. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/qeth_core.h1
-rw-r--r--drivers/s390/net/qeth_core_main.c210
-rw-r--r--drivers/s390/net/qeth_l2_main.c94
-rw-r--r--drivers/s390/net/qeth_l3_main.c226
4 files changed, 259 insertions, 272 deletions
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 26fa5aa65209..5ab498ac3704 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -41,7 +41,6 @@
41enum qeth_dbf_names { 41enum qeth_dbf_names {
42 QETH_DBF_SETUP, 42 QETH_DBF_SETUP,
43 QETH_DBF_QERR, 43 QETH_DBF_QERR,
44 QETH_DBF_TRACE,
45 QETH_DBF_MSG, 44 QETH_DBF_MSG,
46 QETH_DBF_SENSE, 45 QETH_DBF_SENSE,
47 QETH_DBF_MISC, 46 QETH_DBF_MISC,
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index a06a9b79e336..31fe5b49e340 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -34,8 +34,6 @@ struct qeth_dbf_info qeth_dbf[QETH_DBF_INFOS] = {
34 8, 1, 8, 5, &debug_hex_ascii_view, NULL}, 34 8, 1, 8, 5, &debug_hex_ascii_view, NULL},
35 [QETH_DBF_QERR] = {"qeth_qerr", 35 [QETH_DBF_QERR] = {"qeth_qerr",
36 2, 1, 8, 2, &debug_hex_ascii_view, NULL}, 36 2, 1, 8, 2, &debug_hex_ascii_view, NULL},
37 [QETH_DBF_TRACE] = {"qeth_trace",
38 4, 1, 8, 3, &debug_hex_ascii_view, NULL},
39 [QETH_DBF_MSG] = {"qeth_msg", 37 [QETH_DBF_MSG] = {"qeth_msg",
40 8, 1, 128, 3, &debug_sprintf_view, NULL}, 38 8, 1, 128, 3, &debug_sprintf_view, NULL},
41 [QETH_DBF_SENSE] = {"qeth_sense", 39 [QETH_DBF_SENSE] = {"qeth_sense",
@@ -232,7 +230,7 @@ void qeth_clear_working_pool_list(struct qeth_card *card)
232{ 230{
233 struct qeth_buffer_pool_entry *pool_entry, *tmp; 231 struct qeth_buffer_pool_entry *pool_entry, *tmp;
234 232
235 QETH_DBF_TEXT(TRACE, 5, "clwrklst"); 233 QETH_CARD_TEXT(card, 5, "clwrklst");
236 list_for_each_entry_safe(pool_entry, tmp, 234 list_for_each_entry_safe(pool_entry, tmp,
237 &card->qdio.in_buf_pool.entry_list, list){ 235 &card->qdio.in_buf_pool.entry_list, list){
238 list_del(&pool_entry->list); 236 list_del(&pool_entry->list);
@@ -246,7 +244,7 @@ static int qeth_alloc_buffer_pool(struct qeth_card *card)
246 void *ptr; 244 void *ptr;
247 int i, j; 245 int i, j;
248 246
249 QETH_DBF_TEXT(TRACE, 5, "alocpool"); 247 QETH_CARD_TEXT(card, 5, "alocpool");
250 for (i = 0; i < card->qdio.init_pool.buf_count; ++i) { 248 for (i = 0; i < card->qdio.init_pool.buf_count; ++i) {
251 pool_entry = kmalloc(sizeof(*pool_entry), GFP_KERNEL); 249 pool_entry = kmalloc(sizeof(*pool_entry), GFP_KERNEL);
252 if (!pool_entry) { 250 if (!pool_entry) {
@@ -273,7 +271,7 @@ static int qeth_alloc_buffer_pool(struct qeth_card *card)
273 271
274int qeth_realloc_buffer_pool(struct qeth_card *card, int bufcnt) 272int qeth_realloc_buffer_pool(struct qeth_card *card, int bufcnt)
275{ 273{
276 QETH_DBF_TEXT(TRACE, 2, "realcbp"); 274 QETH_CARD_TEXT(card, 2, "realcbp");
277 275
278 if ((card->state != CARD_STATE_DOWN) && 276 if ((card->state != CARD_STATE_DOWN) &&
279 (card->state != CARD_STATE_RECOVER)) 277 (card->state != CARD_STATE_RECOVER))
@@ -293,7 +291,7 @@ static int qeth_issue_next_read(struct qeth_card *card)
293 int rc; 291 int rc;
294 struct qeth_cmd_buffer *iob; 292 struct qeth_cmd_buffer *iob;
295 293
296 QETH_DBF_TEXT(TRACE, 5, "issnxrd"); 294 QETH_CARD_TEXT(card, 5, "issnxrd");
297 if (card->read.state != CH_STATE_UP) 295 if (card->read.state != CH_STATE_UP)
298 return -EIO; 296 return -EIO;
299 iob = qeth_get_buffer(&card->read); 297 iob = qeth_get_buffer(&card->read);
@@ -305,7 +303,7 @@ static int qeth_issue_next_read(struct qeth_card *card)
305 return -ENOMEM; 303 return -ENOMEM;
306 } 304 }
307 qeth_setup_ccw(&card->read, iob->data, QETH_BUFSIZE); 305 qeth_setup_ccw(&card->read, iob->data, QETH_BUFSIZE);
308 QETH_DBF_TEXT(TRACE, 6, "noirqpnd"); 306 QETH_CARD_TEXT(card, 6, "noirqpnd");
309 rc = ccw_device_start(card->read.ccwdev, &card->read.ccw, 307 rc = ccw_device_start(card->read.ccwdev, &card->read.ccw,
310 (addr_t) iob, 0, 0); 308 (addr_t) iob, 0, 0);
311 if (rc) { 309 if (rc) {
@@ -364,7 +362,7 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
364{ 362{
365 struct qeth_ipa_cmd *cmd = NULL; 363 struct qeth_ipa_cmd *cmd = NULL;
366 364
367 QETH_DBF_TEXT(TRACE, 5, "chkipad"); 365 QETH_CARD_TEXT(card, 5, "chkipad");
368 if (IS_IPA(iob->data)) { 366 if (IS_IPA(iob->data)) {
369 cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data); 367 cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data);
370 if (IS_IPA_REPLY(cmd)) { 368 if (IS_IPA_REPLY(cmd)) {
@@ -400,10 +398,10 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
400 case IPA_CMD_MODCCID: 398 case IPA_CMD_MODCCID:
401 return cmd; 399 return cmd;
402 case IPA_CMD_REGISTER_LOCAL_ADDR: 400 case IPA_CMD_REGISTER_LOCAL_ADDR:
403 QETH_DBF_TEXT(TRACE, 3, "irla"); 401 QETH_CARD_TEXT(card, 3, "irla");
404 break; 402 break;
405 case IPA_CMD_UNREGISTER_LOCAL_ADDR: 403 case IPA_CMD_UNREGISTER_LOCAL_ADDR:
406 QETH_DBF_TEXT(TRACE, 3, "urla"); 404 QETH_CARD_TEXT(card, 3, "urla");
407 break; 405 break;
408 default: 406 default:
409 QETH_DBF_MESSAGE(2, "Received data is IPA " 407 QETH_DBF_MESSAGE(2, "Received data is IPA "
@@ -420,7 +418,7 @@ void qeth_clear_ipacmd_list(struct qeth_card *card)
420 struct qeth_reply *reply, *r; 418 struct qeth_reply *reply, *r;
421 unsigned long flags; 419 unsigned long flags;
422 420
423 QETH_DBF_TEXT(TRACE, 4, "clipalst"); 421 QETH_CARD_TEXT(card, 4, "clipalst");
424 422
425 spin_lock_irqsave(&card->lock, flags); 423 spin_lock_irqsave(&card->lock, flags);
426 list_for_each_entry_safe(reply, r, &card->cmd_waiter_list, list) { 424 list_for_each_entry_safe(reply, r, &card->cmd_waiter_list, list) {
@@ -448,9 +446,9 @@ static int qeth_check_idx_response(struct qeth_card *card,
448 buffer[4], 446 buffer[4],
449 ((buffer[4] == 0x22) ? 447 ((buffer[4] == 0x22) ?
450 " -- try another portname" : "")); 448 " -- try another portname" : ""));
451 QETH_DBF_TEXT(TRACE, 2, "ckidxres"); 449 QETH_CARD_TEXT(card, 2, "ckidxres");
452 QETH_DBF_TEXT(TRACE, 2, " idxterm"); 450 QETH_CARD_TEXT(card, 2, " idxterm");
453 QETH_DBF_TEXT_(TRACE, 2, " rc%d", -EIO); 451 QETH_CARD_TEXT_(card, 2, " rc%d", -EIO);
454 if (buffer[4] == 0xf6) { 452 if (buffer[4] == 0xf6) {
455 dev_err(&card->gdev->dev, 453 dev_err(&card->gdev->dev,
456 "The qeth device is not configured " 454 "The qeth device is not configured "
@@ -467,8 +465,8 @@ static void qeth_setup_ccw(struct qeth_channel *channel, unsigned char *iob,
467{ 465{
468 struct qeth_card *card; 466 struct qeth_card *card;
469 467
470 QETH_DBF_TEXT(TRACE, 4, "setupccw");
471 card = CARD_FROM_CDEV(channel->ccwdev); 468 card = CARD_FROM_CDEV(channel->ccwdev);
469 QETH_CARD_TEXT(card, 4, "setupccw");
472 if (channel == &card->read) 470 if (channel == &card->read)
473 memcpy(&channel->ccw, READ_CCW, sizeof(struct ccw1)); 471 memcpy(&channel->ccw, READ_CCW, sizeof(struct ccw1));
474 else 472 else
@@ -481,7 +479,7 @@ static struct qeth_cmd_buffer *__qeth_get_buffer(struct qeth_channel *channel)
481{ 479{
482 __u8 index; 480 __u8 index;
483 481
484 QETH_DBF_TEXT(TRACE, 6, "getbuff"); 482 QETH_CARD_TEXT(CARD_FROM_CDEV(channel->ccwdev), 6, "getbuff");
485 index = channel->io_buf_no; 483 index = channel->io_buf_no;
486 do { 484 do {
487 if (channel->iob[index].state == BUF_STATE_FREE) { 485 if (channel->iob[index].state == BUF_STATE_FREE) {
@@ -502,7 +500,7 @@ void qeth_release_buffer(struct qeth_channel *channel,
502{ 500{
503 unsigned long flags; 501 unsigned long flags;
504 502
505 QETH_DBF_TEXT(TRACE, 6, "relbuff"); 503 QETH_CARD_TEXT(CARD_FROM_CDEV(channel->ccwdev), 6, "relbuff");
506 spin_lock_irqsave(&channel->iob_lock, flags); 504 spin_lock_irqsave(&channel->iob_lock, flags);
507 memset(iob->data, 0, QETH_BUFSIZE); 505 memset(iob->data, 0, QETH_BUFSIZE);
508 iob->state = BUF_STATE_FREE; 506 iob->state = BUF_STATE_FREE;
@@ -553,9 +551,8 @@ static void qeth_send_control_data_cb(struct qeth_channel *channel,
553 int keep_reply; 551 int keep_reply;
554 int rc = 0; 552 int rc = 0;
555 553
556 QETH_DBF_TEXT(TRACE, 4, "sndctlcb");
557
558 card = CARD_FROM_CDEV(channel->ccwdev); 554 card = CARD_FROM_CDEV(channel->ccwdev);
555 QETH_CARD_TEXT(card, 4, "sndctlcb");
559 rc = qeth_check_idx_response(card, iob->data); 556 rc = qeth_check_idx_response(card, iob->data);
560 switch (rc) { 557 switch (rc) {
561 case 0: 558 case 0:
@@ -722,7 +719,7 @@ EXPORT_SYMBOL_GPL(qeth_do_run_thread);
722 719
723void qeth_schedule_recovery(struct qeth_card *card) 720void qeth_schedule_recovery(struct qeth_card *card)
724{ 721{
725 QETH_DBF_TEXT(TRACE, 2, "startrec"); 722 QETH_CARD_TEXT(card, 2, "startrec");
726 if (qeth_set_thread_start_bit(card, QETH_RECOVER_THREAD) == 0) 723 if (qeth_set_thread_start_bit(card, QETH_RECOVER_THREAD) == 0)
727 schedule_work(&card->kernel_thread_starter); 724 schedule_work(&card->kernel_thread_starter);
728} 725}
@@ -732,15 +729,17 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
732{ 729{
733 int dstat, cstat; 730 int dstat, cstat;
734 char *sense; 731 char *sense;
732 struct qeth_card *card;
735 733
736 sense = (char *) irb->ecw; 734 sense = (char *) irb->ecw;
737 cstat = irb->scsw.cmd.cstat; 735 cstat = irb->scsw.cmd.cstat;
738 dstat = irb->scsw.cmd.dstat; 736 dstat = irb->scsw.cmd.dstat;
737 card = CARD_FROM_CDEV(cdev);
739 738
740 if (cstat & (SCHN_STAT_CHN_CTRL_CHK | SCHN_STAT_INTF_CTRL_CHK | 739 if (cstat & (SCHN_STAT_CHN_CTRL_CHK | SCHN_STAT_INTF_CTRL_CHK |
741 SCHN_STAT_CHN_DATA_CHK | SCHN_STAT_CHAIN_CHECK | 740 SCHN_STAT_CHN_DATA_CHK | SCHN_STAT_CHAIN_CHECK |
742 SCHN_STAT_PROT_CHECK | SCHN_STAT_PROG_CHECK)) { 741 SCHN_STAT_PROT_CHECK | SCHN_STAT_PROG_CHECK)) {
743 QETH_DBF_TEXT(TRACE, 2, "CGENCHK"); 742 QETH_CARD_TEXT(card, 2, "CGENCHK");
744 dev_warn(&cdev->dev, "The qeth device driver " 743 dev_warn(&cdev->dev, "The qeth device driver "
745 "failed to recover an error on the device\n"); 744 "failed to recover an error on the device\n");
746 QETH_DBF_MESSAGE(2, "%s check on device dstat=x%x, cstat=x%x\n", 745 QETH_DBF_MESSAGE(2, "%s check on device dstat=x%x, cstat=x%x\n",
@@ -753,23 +752,23 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
753 if (dstat & DEV_STAT_UNIT_CHECK) { 752 if (dstat & DEV_STAT_UNIT_CHECK) {
754 if (sense[SENSE_RESETTING_EVENT_BYTE] & 753 if (sense[SENSE_RESETTING_EVENT_BYTE] &
755 SENSE_RESETTING_EVENT_FLAG) { 754 SENSE_RESETTING_EVENT_FLAG) {
756 QETH_DBF_TEXT(TRACE, 2, "REVIND"); 755 QETH_CARD_TEXT(card, 2, "REVIND");
757 return 1; 756 return 1;
758 } 757 }
759 if (sense[SENSE_COMMAND_REJECT_BYTE] & 758 if (sense[SENSE_COMMAND_REJECT_BYTE] &
760 SENSE_COMMAND_REJECT_FLAG) { 759 SENSE_COMMAND_REJECT_FLAG) {
761 QETH_DBF_TEXT(TRACE, 2, "CMDREJi"); 760 QETH_CARD_TEXT(card, 2, "CMDREJi");
762 return 1; 761 return 1;
763 } 762 }
764 if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) { 763 if ((sense[2] == 0xaf) && (sense[3] == 0xfe)) {
765 QETH_DBF_TEXT(TRACE, 2, "AFFE"); 764 QETH_CARD_TEXT(card, 2, "AFFE");
766 return 1; 765 return 1;
767 } 766 }
768 if ((!sense[0]) && (!sense[1]) && (!sense[2]) && (!sense[3])) { 767 if ((!sense[0]) && (!sense[1]) && (!sense[2]) && (!sense[3])) {
769 QETH_DBF_TEXT(TRACE, 2, "ZEROSEN"); 768 QETH_CARD_TEXT(card, 2, "ZEROSEN");
770 return 0; 769 return 0;
771 } 770 }
772 QETH_DBF_TEXT(TRACE, 2, "DGENCHK"); 771 QETH_CARD_TEXT(card, 2, "DGENCHK");
773 return 1; 772 return 1;
774 } 773 }
775 return 0; 774 return 0;
@@ -778,6 +777,10 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
778static long __qeth_check_irb_error(struct ccw_device *cdev, 777static long __qeth_check_irb_error(struct ccw_device *cdev,
779 unsigned long intparm, struct irb *irb) 778 unsigned long intparm, struct irb *irb)
780{ 779{
780 struct qeth_card *card;
781
782 card = CARD_FROM_CDEV(cdev);
783
781 if (!IS_ERR(irb)) 784 if (!IS_ERR(irb))
782 return 0; 785 return 0;
783 786
@@ -785,17 +788,15 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,
785 case -EIO: 788 case -EIO:
786 QETH_DBF_MESSAGE(2, "%s i/o-error on device\n", 789 QETH_DBF_MESSAGE(2, "%s i/o-error on device\n",
787 dev_name(&cdev->dev)); 790 dev_name(&cdev->dev));
788 QETH_DBF_TEXT(TRACE, 2, "ckirberr"); 791 QETH_CARD_TEXT(card, 2, "ckirberr");
789 QETH_DBF_TEXT_(TRACE, 2, " rc%d", -EIO); 792 QETH_CARD_TEXT_(card, 2, " rc%d", -EIO);
790 break; 793 break;
791 case -ETIMEDOUT: 794 case -ETIMEDOUT:
792 dev_warn(&cdev->dev, "A hardware operation timed out" 795 dev_warn(&cdev->dev, "A hardware operation timed out"
793 " on the device\n"); 796 " on the device\n");
794 QETH_DBF_TEXT(TRACE, 2, "ckirberr"); 797 QETH_CARD_TEXT(card, 2, "ckirberr");
795 QETH_DBF_TEXT_(TRACE, 2, " rc%d", -ETIMEDOUT); 798 QETH_CARD_TEXT_(card, 2, " rc%d", -ETIMEDOUT);
796 if (intparm == QETH_RCD_PARM) { 799 if (intparm == QETH_RCD_PARM) {
797 struct qeth_card *card = CARD_FROM_CDEV(cdev);
798
799 if (card && (card->data.ccwdev == cdev)) { 800 if (card && (card->data.ccwdev == cdev)) {
800 card->data.state = CH_STATE_DOWN; 801 card->data.state = CH_STATE_DOWN;
801 wake_up(&card->wait_q); 802 wake_up(&card->wait_q);
@@ -805,8 +806,8 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,
805 default: 806 default:
806 QETH_DBF_MESSAGE(2, "%s unknown error %ld on device\n", 807 QETH_DBF_MESSAGE(2, "%s unknown error %ld on device\n",
807 dev_name(&cdev->dev), PTR_ERR(irb)); 808 dev_name(&cdev->dev), PTR_ERR(irb));
808 QETH_DBF_TEXT(TRACE, 2, "ckirberr"); 809 QETH_CARD_TEXT(card, 2, "ckirberr");
809 QETH_DBF_TEXT(TRACE, 2, " rc???"); 810 QETH_CARD_TEXT(card, 2, " rc???");
810 } 811 }
811 return PTR_ERR(irb); 812 return PTR_ERR(irb);
812} 813}
@@ -822,8 +823,6 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
822 struct qeth_cmd_buffer *iob; 823 struct qeth_cmd_buffer *iob;
823 __u8 index; 824 __u8 index;
824 825
825 QETH_DBF_TEXT(TRACE, 5, "irq");
826
827 if (__qeth_check_irb_error(cdev, intparm, irb)) 826 if (__qeth_check_irb_error(cdev, intparm, irb))
828 return; 827 return;
829 cstat = irb->scsw.cmd.cstat; 828 cstat = irb->scsw.cmd.cstat;
@@ -833,15 +832,17 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
833 if (!card) 832 if (!card)
834 return; 833 return;
835 834
835 QETH_CARD_TEXT(card, 5, "irq");
836
836 if (card->read.ccwdev == cdev) { 837 if (card->read.ccwdev == cdev) {
837 channel = &card->read; 838 channel = &card->read;
838 QETH_DBF_TEXT(TRACE, 5, "read"); 839 QETH_CARD_TEXT(card, 5, "read");
839 } else if (card->write.ccwdev == cdev) { 840 } else if (card->write.ccwdev == cdev) {
840 channel = &card->write; 841 channel = &card->write;
841 QETH_DBF_TEXT(TRACE, 5, "write"); 842 QETH_CARD_TEXT(card, 5, "write");
842 } else { 843 } else {
843 channel = &card->data; 844 channel = &card->data;
844 QETH_DBF_TEXT(TRACE, 5, "data"); 845 QETH_CARD_TEXT(card, 5, "data");
845 } 846 }
846 atomic_set(&channel->irq_pending, 0); 847 atomic_set(&channel->irq_pending, 0);
847 848
@@ -857,12 +858,12 @@ static void qeth_irq(struct ccw_device *cdev, unsigned long intparm,
857 goto out; 858 goto out;
858 859
859 if (intparm == QETH_CLEAR_CHANNEL_PARM) { 860 if (intparm == QETH_CLEAR_CHANNEL_PARM) {
860 QETH_DBF_TEXT(TRACE, 6, "clrchpar"); 861 QETH_CARD_TEXT(card, 6, "clrchpar");
861 /* we don't have to handle this further */ 862 /* we don't have to handle this further */
862 intparm = 0; 863 intparm = 0;
863 } 864 }
864 if (intparm == QETH_HALT_CHANNEL_PARM) { 865 if (intparm == QETH_HALT_CHANNEL_PARM) {
865 QETH_DBF_TEXT(TRACE, 6, "hltchpar"); 866 QETH_CARD_TEXT(card, 6, "hltchpar");
866 /* we don't have to handle this further */ 867 /* we don't have to handle this further */
867 intparm = 0; 868 intparm = 0;
868 } 869 }
@@ -963,7 +964,7 @@ void qeth_clear_qdio_buffers(struct qeth_card *card)
963{ 964{
964 int i, j; 965 int i, j;
965 966
966 QETH_DBF_TEXT(TRACE, 2, "clearqdbf"); 967 QETH_CARD_TEXT(card, 2, "clearqdbf");
967 /* clear outbound buffers to free skbs */ 968 /* clear outbound buffers to free skbs */
968 for (i = 0; i < card->qdio.no_out_queues; ++i) 969 for (i = 0; i < card->qdio.no_out_queues; ++i)
969 if (card->qdio.out_qs[i]) { 970 if (card->qdio.out_qs[i]) {
@@ -978,7 +979,7 @@ static void qeth_free_buffer_pool(struct qeth_card *card)
978{ 979{
979 struct qeth_buffer_pool_entry *pool_entry, *tmp; 980 struct qeth_buffer_pool_entry *pool_entry, *tmp;
980 int i = 0; 981 int i = 0;
981 QETH_DBF_TEXT(TRACE, 5, "freepool"); 982 QETH_CARD_TEXT(card, 5, "freepool");
982 list_for_each_entry_safe(pool_entry, tmp, 983 list_for_each_entry_safe(pool_entry, tmp,
983 &card->qdio.init_pool.entry_list, init_list){ 984 &card->qdio.init_pool.entry_list, init_list){
984 for (i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i) 985 for (i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i)
@@ -992,7 +993,6 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)
992{ 993{
993 int i, j; 994 int i, j;
994 995
995 QETH_DBF_TEXT(TRACE, 2, "freeqdbf");
996 if (atomic_xchg(&card->qdio.state, QETH_QDIO_UNINITIALIZED) == 996 if (atomic_xchg(&card->qdio.state, QETH_QDIO_UNINITIALIZED) ==
997 QETH_QDIO_UNINITIALIZED) 997 QETH_QDIO_UNINITIALIZED)
998 return; 998 return;
@@ -1089,7 +1089,7 @@ static int qeth_do_start_thread(struct qeth_card *card, unsigned long thread)
1089 int rc = 0; 1089 int rc = 0;
1090 1090
1091 spin_lock_irqsave(&card->thread_mask_lock, flags); 1091 spin_lock_irqsave(&card->thread_mask_lock, flags);
1092 QETH_DBF_TEXT_(TRACE, 4, " %02x%02x%02x", 1092 QETH_CARD_TEXT_(card, 4, " %02x%02x%02x",
1093 (u8) card->thread_start_mask, 1093 (u8) card->thread_start_mask,
1094 (u8) card->thread_allowed_mask, 1094 (u8) card->thread_allowed_mask,
1095 (u8) card->thread_running_mask); 1095 (u8) card->thread_running_mask);
@@ -1102,7 +1102,7 @@ static void qeth_start_kernel_thread(struct work_struct *work)
1102{ 1102{
1103 struct qeth_card *card = container_of(work, struct qeth_card, 1103 struct qeth_card *card = container_of(work, struct qeth_card,
1104 kernel_thread_starter); 1104 kernel_thread_starter);
1105 QETH_DBF_TEXT(TRACE , 2, "strthrd"); 1105 QETH_CARD_TEXT(card , 2, "strthrd");
1106 1106
1107 if (card->read.state != CH_STATE_UP && 1107 if (card->read.state != CH_STATE_UP &&
1108 card->write.state != CH_STATE_UP) 1108 card->write.state != CH_STATE_UP)
@@ -1229,8 +1229,8 @@ static int qeth_clear_channel(struct qeth_channel *channel)
1229 struct qeth_card *card; 1229 struct qeth_card *card;
1230 int rc; 1230 int rc;
1231 1231
1232 QETH_DBF_TEXT(TRACE, 3, "clearch");
1233 card = CARD_FROM_CDEV(channel->ccwdev); 1232 card = CARD_FROM_CDEV(channel->ccwdev);
1233 QETH_CARD_TEXT(card, 3, "clearch");
1234 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 1234 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
1235 rc = ccw_device_clear(channel->ccwdev, QETH_CLEAR_CHANNEL_PARM); 1235 rc = ccw_device_clear(channel->ccwdev, QETH_CLEAR_CHANNEL_PARM);
1236 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); 1236 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
@@ -1253,8 +1253,8 @@ static int qeth_halt_channel(struct qeth_channel *channel)
1253 struct qeth_card *card; 1253 struct qeth_card *card;
1254 int rc; 1254 int rc;
1255 1255
1256 QETH_DBF_TEXT(TRACE, 3, "haltch");
1257 card = CARD_FROM_CDEV(channel->ccwdev); 1256 card = CARD_FROM_CDEV(channel->ccwdev);
1257 QETH_CARD_TEXT(card, 3, "haltch");
1258 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 1258 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
1259 rc = ccw_device_halt(channel->ccwdev, QETH_HALT_CHANNEL_PARM); 1259 rc = ccw_device_halt(channel->ccwdev, QETH_HALT_CHANNEL_PARM);
1260 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); 1260 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
@@ -1274,7 +1274,7 @@ static int qeth_halt_channels(struct qeth_card *card)
1274{ 1274{
1275 int rc1 = 0, rc2 = 0, rc3 = 0; 1275 int rc1 = 0, rc2 = 0, rc3 = 0;
1276 1276
1277 QETH_DBF_TEXT(TRACE, 3, "haltchs"); 1277 QETH_CARD_TEXT(card, 3, "haltchs");
1278 rc1 = qeth_halt_channel(&card->read); 1278 rc1 = qeth_halt_channel(&card->read);
1279 rc2 = qeth_halt_channel(&card->write); 1279 rc2 = qeth_halt_channel(&card->write);
1280 rc3 = qeth_halt_channel(&card->data); 1280 rc3 = qeth_halt_channel(&card->data);
@@ -1289,7 +1289,7 @@ static int qeth_clear_channels(struct qeth_card *card)
1289{ 1289{
1290 int rc1 = 0, rc2 = 0, rc3 = 0; 1290 int rc1 = 0, rc2 = 0, rc3 = 0;
1291 1291
1292 QETH_DBF_TEXT(TRACE, 3, "clearchs"); 1292 QETH_CARD_TEXT(card, 3, "clearchs");
1293 rc1 = qeth_clear_channel(&card->read); 1293 rc1 = qeth_clear_channel(&card->read);
1294 rc2 = qeth_clear_channel(&card->write); 1294 rc2 = qeth_clear_channel(&card->write);
1295 rc3 = qeth_clear_channel(&card->data); 1295 rc3 = qeth_clear_channel(&card->data);
@@ -1304,8 +1304,7 @@ static int qeth_clear_halt_card(struct qeth_card *card, int halt)
1304{ 1304{
1305 int rc = 0; 1305 int rc = 0;
1306 1306
1307 QETH_DBF_TEXT(TRACE, 3, "clhacrd"); 1307 QETH_CARD_TEXT(card, 3, "clhacrd");
1308 QETH_DBF_HEX(TRACE, 3, &card, sizeof(void *));
1309 1308
1310 if (halt) 1309 if (halt)
1311 rc = qeth_halt_channels(card); 1310 rc = qeth_halt_channels(card);
@@ -1318,7 +1317,7 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt)
1318{ 1317{
1319 int rc = 0; 1318 int rc = 0;
1320 1319
1321 QETH_DBF_TEXT(TRACE, 3, "qdioclr"); 1320 QETH_CARD_TEXT(card, 3, "qdioclr");
1322 switch (atomic_cmpxchg(&card->qdio.state, QETH_QDIO_ESTABLISHED, 1321 switch (atomic_cmpxchg(&card->qdio.state, QETH_QDIO_ESTABLISHED,
1323 QETH_QDIO_CLEANING)) { 1322 QETH_QDIO_CLEANING)) {
1324 case QETH_QDIO_ESTABLISHED: 1323 case QETH_QDIO_ESTABLISHED:
@@ -1329,7 +1328,7 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt)
1329 rc = qdio_shutdown(CARD_DDEV(card), 1328 rc = qdio_shutdown(CARD_DDEV(card),
1330 QDIO_FLAG_CLEANUP_USING_CLEAR); 1329 QDIO_FLAG_CLEANUP_USING_CLEAR);
1331 if (rc) 1330 if (rc)
1332 QETH_DBF_TEXT_(TRACE, 3, "1err%d", rc); 1331 QETH_CARD_TEXT_(card, 3, "1err%d", rc);
1333 qdio_free(CARD_DDEV(card)); 1332 qdio_free(CARD_DDEV(card));
1334 atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED); 1333 atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED);
1335 break; 1334 break;
@@ -1340,7 +1339,7 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt)
1340 } 1339 }
1341 rc = qeth_clear_halt_card(card, use_halt); 1340 rc = qeth_clear_halt_card(card, use_halt);
1342 if (rc) 1341 if (rc)
1343 QETH_DBF_TEXT_(TRACE, 3, "2err%d", rc); 1342 QETH_CARD_TEXT_(card, 3, "2err%d", rc);
1344 card->state = CARD_STATE_DOWN; 1343 card->state = CARD_STATE_DOWN;
1345 return rc; 1344 return rc;
1346} 1345}
@@ -1705,7 +1704,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,
1705 unsigned long timeout, event_timeout; 1704 unsigned long timeout, event_timeout;
1706 struct qeth_ipa_cmd *cmd; 1705 struct qeth_ipa_cmd *cmd;
1707 1706
1708 QETH_DBF_TEXT(TRACE, 2, "sendctl"); 1707 QETH_CARD_TEXT(card, 2, "sendctl");
1709 1708
1710 reply = qeth_alloc_reply(card); 1709 reply = qeth_alloc_reply(card);
1711 if (!reply) { 1710 if (!reply) {
@@ -1732,7 +1731,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,
1732 event_timeout = QETH_TIMEOUT; 1731 event_timeout = QETH_TIMEOUT;
1733 timeout = jiffies + event_timeout; 1732 timeout = jiffies + event_timeout;
1734 1733
1735 QETH_DBF_TEXT(TRACE, 6, "noirqpnd"); 1734 QETH_CARD_TEXT(card, 6, "noirqpnd");
1736 spin_lock_irqsave(get_ccwdev_lock(card->write.ccwdev), flags); 1735 spin_lock_irqsave(get_ccwdev_lock(card->write.ccwdev), flags);
1737 rc = ccw_device_start(card->write.ccwdev, &card->write.ccw, 1736 rc = ccw_device_start(card->write.ccwdev, &card->write.ccw,
1738 (addr_t) iob, 0, 0); 1737 (addr_t) iob, 0, 0);
@@ -1741,7 +1740,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,
1741 QETH_DBF_MESSAGE(2, "%s qeth_send_control_data: " 1740 QETH_DBF_MESSAGE(2, "%s qeth_send_control_data: "
1742 "ccw_device_start rc = %i\n", 1741 "ccw_device_start rc = %i\n",
1743 dev_name(&card->write.ccwdev->dev), rc); 1742 dev_name(&card->write.ccwdev->dev), rc);
1744 QETH_DBF_TEXT_(TRACE, 2, " err%d", rc); 1743 QETH_CARD_TEXT_(card, 2, " err%d", rc);
1745 spin_lock_irqsave(&card->lock, flags); 1744 spin_lock_irqsave(&card->lock, flags);
1746 list_del_init(&reply->list); 1745 list_del_init(&reply->list);
1747 qeth_put_reply(reply); 1746 qeth_put_reply(reply);
@@ -2335,7 +2334,7 @@ static void qeth_initialize_working_pool_list(struct qeth_card *card)
2335{ 2334{
2336 struct qeth_buffer_pool_entry *entry; 2335 struct qeth_buffer_pool_entry *entry;
2337 2336
2338 QETH_DBF_TEXT(TRACE, 5, "inwrklst"); 2337 QETH_CARD_TEXT(card, 5, "inwrklst");
2339 2338
2340 list_for_each_entry(entry, 2339 list_for_each_entry(entry,
2341 &card->qdio.init_pool.entry_list, init_list) { 2340 &card->qdio.init_pool.entry_list, init_list) {
@@ -2522,7 +2521,7 @@ int qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob,
2522 int rc; 2521 int rc;
2523 char prot_type; 2522 char prot_type;
2524 2523
2525 QETH_DBF_TEXT(TRACE, 4, "sendipa"); 2524 QETH_CARD_TEXT(card, 4, "sendipa");
2526 2525
2527 if (card->options.layer2) 2526 if (card->options.layer2)
2528 if (card->info.type == QETH_CARD_TYPE_OSN) 2527 if (card->info.type == QETH_CARD_TYPE_OSN)
@@ -2582,7 +2581,7 @@ int qeth_default_setadapterparms_cb(struct qeth_card *card,
2582{ 2581{
2583 struct qeth_ipa_cmd *cmd; 2582 struct qeth_ipa_cmd *cmd;
2584 2583
2585 QETH_DBF_TEXT(TRACE, 4, "defadpcb"); 2584 QETH_CARD_TEXT(card, 4, "defadpcb");
2586 2585
2587 cmd = (struct qeth_ipa_cmd *) data; 2586 cmd = (struct qeth_ipa_cmd *) data;
2588 if (cmd->hdr.return_code == 0) 2587 if (cmd->hdr.return_code == 0)
@@ -2597,7 +2596,7 @@ static int qeth_query_setadapterparms_cb(struct qeth_card *card,
2597{ 2596{
2598 struct qeth_ipa_cmd *cmd; 2597 struct qeth_ipa_cmd *cmd;
2599 2598
2600 QETH_DBF_TEXT(TRACE, 3, "quyadpcb"); 2599 QETH_CARD_TEXT(card, 3, "quyadpcb");
2601 2600
2602 cmd = (struct qeth_ipa_cmd *) data; 2601 cmd = (struct qeth_ipa_cmd *) data;
2603 if (cmd->data.setadapterparms.data.query_cmds_supp.lan_type & 0x7f) { 2602 if (cmd->data.setadapterparms.data.query_cmds_supp.lan_type & 0x7f) {
@@ -2633,7 +2632,7 @@ int qeth_query_setadapterparms(struct qeth_card *card)
2633 int rc; 2632 int rc;
2634 struct qeth_cmd_buffer *iob; 2633 struct qeth_cmd_buffer *iob;
2635 2634
2636 QETH_DBF_TEXT(TRACE, 3, "queryadp"); 2635 QETH_CARD_TEXT(card, 3, "queryadp");
2637 iob = qeth_get_adapter_cmd(card, IPA_SETADP_QUERY_COMMANDS_SUPPORTED, 2636 iob = qeth_get_adapter_cmd(card, IPA_SETADP_QUERY_COMMANDS_SUPPORTED,
2638 sizeof(struct qeth_ipacmd_setadpparms)); 2637 sizeof(struct qeth_ipacmd_setadpparms));
2639 rc = qeth_send_ipa_cmd(card, iob, qeth_query_setadapterparms_cb, NULL); 2638 rc = qeth_send_ipa_cmd(card, iob, qeth_query_setadapterparms_cb, NULL);
@@ -2645,7 +2644,7 @@ int qeth_check_qdio_errors(struct qeth_card *card, struct qdio_buffer *buf,
2645 unsigned int qdio_error, const char *dbftext) 2644 unsigned int qdio_error, const char *dbftext)
2646{ 2645{
2647 if (qdio_error) { 2646 if (qdio_error) {
2648 QETH_DBF_TEXT(TRACE, 2, dbftext); 2647 QETH_CARD_TEXT(card, 2, dbftext);
2649 QETH_DBF_TEXT(QERR, 2, dbftext); 2648 QETH_DBF_TEXT(QERR, 2, dbftext);
2650 QETH_DBF_TEXT_(QERR, 2, " F15=%02X", 2649 QETH_DBF_TEXT_(QERR, 2, " F15=%02X",
2651 buf->element[15].flags & 0xff); 2650 buf->element[15].flags & 0xff);
@@ -2717,8 +2716,7 @@ void qeth_queue_input_buffer(struct qeth_card *card, int index)
2717 if (rc) { 2716 if (rc) {
2718 dev_warn(&card->gdev->dev, 2717 dev_warn(&card->gdev->dev,
2719 "QDIO reported an error, rc=%i\n", rc); 2718 "QDIO reported an error, rc=%i\n", rc);
2720 QETH_DBF_TEXT(TRACE, 2, "qinberr"); 2719 QETH_CARD_TEXT(card, 2, "qinberr");
2721 QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_BUS_ID(card));
2722 } 2720 }
2723 queue->next_buf_to_init = (queue->next_buf_to_init + count) % 2721 queue->next_buf_to_init = (queue->next_buf_to_init + count) %
2724 QDIO_MAX_BUFFERS_PER_Q; 2722 QDIO_MAX_BUFFERS_PER_Q;
@@ -2731,7 +2729,7 @@ static int qeth_handle_send_error(struct qeth_card *card,
2731{ 2729{
2732 int sbalf15 = buffer->buffer->element[15].flags & 0xff; 2730 int sbalf15 = buffer->buffer->element[15].flags & 0xff;
2733 2731
2734 QETH_DBF_TEXT(TRACE, 6, "hdsnderr"); 2732 QETH_CARD_TEXT(card, 6, "hdsnderr");
2735 if (card->info.type == QETH_CARD_TYPE_IQD) { 2733 if (card->info.type == QETH_CARD_TYPE_IQD) {
2736 if (sbalf15 == 0) { 2734 if (sbalf15 == 0) {
2737 qdio_err = 0; 2735 qdio_err = 0;
@@ -2747,9 +2745,8 @@ static int qeth_handle_send_error(struct qeth_card *card,
2747 if ((sbalf15 >= 15) && (sbalf15 <= 31)) 2745 if ((sbalf15 >= 15) && (sbalf15 <= 31))
2748 return QETH_SEND_ERROR_RETRY; 2746 return QETH_SEND_ERROR_RETRY;
2749 2747
2750 QETH_DBF_TEXT(TRACE, 1, "lnkfail"); 2748 QETH_CARD_TEXT(card, 1, "lnkfail");
2751 QETH_DBF_TEXT_(TRACE, 1, "%s", CARD_BUS_ID(card)); 2749 QETH_CARD_TEXT_(card, 1, "%04x %02x",
2752 QETH_DBF_TEXT_(TRACE, 1, "%04x %02x",
2753 (u16)qdio_err, (u8)sbalf15); 2750 (u16)qdio_err, (u8)sbalf15);
2754 return QETH_SEND_ERROR_LINK_FAILURE; 2751 return QETH_SEND_ERROR_LINK_FAILURE;
2755} 2752}
@@ -2764,7 +2761,7 @@ static void qeth_switch_to_packing_if_needed(struct qeth_qdio_out_q *queue)
2764 if (atomic_read(&queue->used_buffers) 2761 if (atomic_read(&queue->used_buffers)
2765 >= QETH_HIGH_WATERMARK_PACK){ 2762 >= QETH_HIGH_WATERMARK_PACK){
2766 /* switch non-PACKING -> PACKING */ 2763 /* switch non-PACKING -> PACKING */
2767 QETH_DBF_TEXT(TRACE, 6, "np->pack"); 2764 QETH_CARD_TEXT(queue->card, 6, "np->pack");
2768 if (queue->card->options.performance_stats) 2765 if (queue->card->options.performance_stats)
2769 queue->card->perf_stats.sc_dp_p++; 2766 queue->card->perf_stats.sc_dp_p++;
2770 queue->do_pack = 1; 2767 queue->do_pack = 1;
@@ -2787,7 +2784,7 @@ static int qeth_switch_to_nonpacking_if_needed(struct qeth_qdio_out_q *queue)
2787 if (atomic_read(&queue->used_buffers) 2784 if (atomic_read(&queue->used_buffers)
2788 <= QETH_LOW_WATERMARK_PACK) { 2785 <= QETH_LOW_WATERMARK_PACK) {
2789 /* switch PACKING -> non-PACKING */ 2786 /* switch PACKING -> non-PACKING */
2790 QETH_DBF_TEXT(TRACE, 6, "pack->np"); 2787 QETH_CARD_TEXT(queue->card, 6, "pack->np");
2791 if (queue->card->options.performance_stats) 2788 if (queue->card->options.performance_stats)
2792 queue->card->perf_stats.sc_p_dp++; 2789 queue->card->perf_stats.sc_p_dp++;
2793 queue->do_pack = 0; 2790 queue->do_pack = 0;
@@ -2896,9 +2893,8 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
2896 /* ignore temporary SIGA errors without busy condition */ 2893 /* ignore temporary SIGA errors without busy condition */
2897 if (rc == QDIO_ERROR_SIGA_TARGET) 2894 if (rc == QDIO_ERROR_SIGA_TARGET)
2898 return; 2895 return;
2899 QETH_DBF_TEXT(TRACE, 2, "flushbuf"); 2896 QETH_CARD_TEXT(queue->card, 2, "flushbuf");
2900 QETH_DBF_TEXT_(TRACE, 2, " err%d", rc); 2897 QETH_CARD_TEXT_(queue->card, 2, " err%d", rc);
2901 QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_DDEV_ID(queue->card));
2902 2898
2903 /* this must not happen under normal circumstances. if it 2899 /* this must not happen under normal circumstances. if it
2904 * happens something is really wrong -> recover */ 2900 * happens something is really wrong -> recover */
@@ -2960,10 +2956,9 @@ void qeth_qdio_output_handler(struct ccw_device *ccwdev,
2960 int i; 2956 int i;
2961 unsigned qeth_send_err; 2957 unsigned qeth_send_err;
2962 2958
2963 QETH_DBF_TEXT(TRACE, 6, "qdouhdl"); 2959 QETH_CARD_TEXT(card, 6, "qdouhdl");
2964 if (qdio_error & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) { 2960 if (qdio_error & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) {
2965 QETH_DBF_TEXT(TRACE, 2, "achkcond"); 2961 QETH_CARD_TEXT(card, 2, "achkcond");
2966 QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_BUS_ID(card));
2967 netif_stop_queue(card->dev); 2962 netif_stop_queue(card->dev);
2968 qeth_schedule_recovery(card); 2963 qeth_schedule_recovery(card);
2969 return; 2964 return;
@@ -3145,12 +3140,12 @@ static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,
3145 (int *)&buf->next_element_to_fill); 3140 (int *)&buf->next_element_to_fill);
3146 3141
3147 if (!queue->do_pack) { 3142 if (!queue->do_pack) {
3148 QETH_DBF_TEXT(TRACE, 6, "fillbfnp"); 3143 QETH_CARD_TEXT(queue->card, 6, "fillbfnp");
3149 /* set state to PRIMED -> will be flushed */ 3144 /* set state to PRIMED -> will be flushed */
3150 atomic_set(&buf->state, QETH_QDIO_BUF_PRIMED); 3145 atomic_set(&buf->state, QETH_QDIO_BUF_PRIMED);
3151 flush_cnt = 1; 3146 flush_cnt = 1;
3152 } else { 3147 } else {
3153 QETH_DBF_TEXT(TRACE, 6, "fillbfpa"); 3148 QETH_CARD_TEXT(queue->card, 6, "fillbfpa");
3154 if (queue->card->options.performance_stats) 3149 if (queue->card->options.performance_stats)
3155 queue->card->perf_stats.skbs_sent_pack++; 3150 queue->card->perf_stats.skbs_sent_pack++;
3156 if (buf->next_element_to_fill >= 3151 if (buf->next_element_to_fill >=
@@ -3312,14 +3307,14 @@ static int qeth_setadp_promisc_mode_cb(struct qeth_card *card,
3312 struct qeth_ipa_cmd *cmd; 3307 struct qeth_ipa_cmd *cmd;
3313 struct qeth_ipacmd_setadpparms *setparms; 3308 struct qeth_ipacmd_setadpparms *setparms;
3314 3309
3315 QETH_DBF_TEXT(TRACE, 4, "prmadpcb"); 3310 QETH_CARD_TEXT(card, 4, "prmadpcb");
3316 3311
3317 cmd = (struct qeth_ipa_cmd *) data; 3312 cmd = (struct qeth_ipa_cmd *) data;
3318 setparms = &(cmd->data.setadapterparms); 3313 setparms = &(cmd->data.setadapterparms);
3319 3314
3320 qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd); 3315 qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd);
3321 if (cmd->hdr.return_code) { 3316 if (cmd->hdr.return_code) {
3322 QETH_DBF_TEXT_(TRACE, 4, "prmrc%2.2x", cmd->hdr.return_code); 3317 QETH_CARD_TEXT_(card, 4, "prmrc%2.2x", cmd->hdr.return_code);
3323 setparms->data.mode = SET_PROMISC_MODE_OFF; 3318 setparms->data.mode = SET_PROMISC_MODE_OFF;
3324 } 3319 }
3325 card->info.promisc_mode = setparms->data.mode; 3320 card->info.promisc_mode = setparms->data.mode;
@@ -3333,7 +3328,7 @@ void qeth_setadp_promisc_mode(struct qeth_card *card)
3333 struct qeth_cmd_buffer *iob; 3328 struct qeth_cmd_buffer *iob;
3334 struct qeth_ipa_cmd *cmd; 3329 struct qeth_ipa_cmd *cmd;
3335 3330
3336 QETH_DBF_TEXT(TRACE, 4, "setprom"); 3331 QETH_CARD_TEXT(card, 4, "setprom");
3337 3332
3338 if (((dev->flags & IFF_PROMISC) && 3333 if (((dev->flags & IFF_PROMISC) &&
3339 (card->info.promisc_mode == SET_PROMISC_MODE_ON)) || 3334 (card->info.promisc_mode == SET_PROMISC_MODE_ON)) ||
@@ -3343,7 +3338,7 @@ void qeth_setadp_promisc_mode(struct qeth_card *card)
3343 mode = SET_PROMISC_MODE_OFF; 3338 mode = SET_PROMISC_MODE_OFF;
3344 if (dev->flags & IFF_PROMISC) 3339 if (dev->flags & IFF_PROMISC)
3345 mode = SET_PROMISC_MODE_ON; 3340 mode = SET_PROMISC_MODE_ON;
3346 QETH_DBF_TEXT_(TRACE, 4, "mode:%x", mode); 3341 QETH_CARD_TEXT_(card, 4, "mode:%x", mode);
3347 3342
3348 iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_PROMISC_MODE, 3343 iob = qeth_get_adapter_cmd(card, IPA_SETADP_SET_PROMISC_MODE,
3349 sizeof(struct qeth_ipacmd_setadpparms)); 3344 sizeof(struct qeth_ipacmd_setadpparms));
@@ -3360,9 +3355,9 @@ int qeth_change_mtu(struct net_device *dev, int new_mtu)
3360 3355
3361 card = dev->ml_priv; 3356 card = dev->ml_priv;
3362 3357
3363 QETH_DBF_TEXT(TRACE, 4, "chgmtu"); 3358 QETH_CARD_TEXT(card, 4, "chgmtu");
3364 sprintf(dbf_text, "%8x", new_mtu); 3359 sprintf(dbf_text, "%8x", new_mtu);
3365 QETH_DBF_TEXT(TRACE, 4, dbf_text); 3360 QETH_CARD_TEXT(card, 4, dbf_text);
3366 3361
3367 if (new_mtu < 64) 3362 if (new_mtu < 64)
3368 return -EINVAL; 3363 return -EINVAL;
@@ -3382,7 +3377,7 @@ struct net_device_stats *qeth_get_stats(struct net_device *dev)
3382 3377
3383 card = dev->ml_priv; 3378 card = dev->ml_priv;
3384 3379
3385 QETH_DBF_TEXT(TRACE, 5, "getstat"); 3380 QETH_CARD_TEXT(card, 5, "getstat");
3386 3381
3387 return &card->stats; 3382 return &card->stats;
3388} 3383}
@@ -3393,7 +3388,7 @@ static int qeth_setadpparms_change_macaddr_cb(struct qeth_card *card,
3393{ 3388{
3394 struct qeth_ipa_cmd *cmd; 3389 struct qeth_ipa_cmd *cmd;
3395 3390
3396 QETH_DBF_TEXT(TRACE, 4, "chgmaccb"); 3391 QETH_CARD_TEXT(card, 4, "chgmaccb");
3397 3392
3398 cmd = (struct qeth_ipa_cmd *) data; 3393 cmd = (struct qeth_ipa_cmd *) data;
3399 if (!card->options.layer2 || 3394 if (!card->options.layer2 ||
@@ -3413,7 +3408,7 @@ int qeth_setadpparms_change_macaddr(struct qeth_card *card)
3413 struct qeth_cmd_buffer *iob; 3408 struct qeth_cmd_buffer *iob;
3414 struct qeth_ipa_cmd *cmd; 3409 struct qeth_ipa_cmd *cmd;
3415 3410
3416 QETH_DBF_TEXT(TRACE, 4, "chgmac"); 3411 QETH_CARD_TEXT(card, 4, "chgmac");
3417 3412
3418 iob = qeth_get_adapter_cmd(card, IPA_SETADP_ALTER_MAC_ADDRESS, 3413 iob = qeth_get_adapter_cmd(card, IPA_SETADP_ALTER_MAC_ADDRESS,
3419 sizeof(struct qeth_ipacmd_setadpparms)); 3414 sizeof(struct qeth_ipacmd_setadpparms));
@@ -3435,7 +3430,7 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3435 struct qeth_set_access_ctrl *access_ctrl_req; 3430 struct qeth_set_access_ctrl *access_ctrl_req;
3436 int rc; 3431 int rc;
3437 3432
3438 QETH_DBF_TEXT(TRACE, 4, "setaccb"); 3433 QETH_CARD_TEXT(card, 4, "setaccb");
3439 3434
3440 cmd = (struct qeth_ipa_cmd *) data; 3435 cmd = (struct qeth_ipa_cmd *) data;
3441 access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl; 3436 access_ctrl_req = &cmd->data.setadapterparms.data.set_access_ctrl;
@@ -3533,7 +3528,7 @@ static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,
3533 struct qeth_ipa_cmd *cmd; 3528 struct qeth_ipa_cmd *cmd;
3534 struct qeth_set_access_ctrl *access_ctrl_req; 3529 struct qeth_set_access_ctrl *access_ctrl_req;
3535 3530
3536 QETH_DBF_TEXT(TRACE, 4, "setacctl"); 3531 QETH_CARD_TEXT(card, 4, "setacctl");
3537 3532
3538 QETH_DBF_TEXT_(SETUP, 2, "setacctl"); 3533 QETH_DBF_TEXT_(SETUP, 2, "setacctl");
3539 QETH_DBF_TEXT_(SETUP, 2, "%s", card->gdev->dev.kobj.name); 3534 QETH_DBF_TEXT_(SETUP, 2, "%s", card->gdev->dev.kobj.name);
@@ -3555,7 +3550,7 @@ int qeth_set_access_ctrl_online(struct qeth_card *card)
3555{ 3550{
3556 int rc = 0; 3551 int rc = 0;
3557 3552
3558 QETH_DBF_TEXT(TRACE, 4, "setactlo"); 3553 QETH_CARD_TEXT(card, 4, "setactlo");
3559 3554
3560 if ((card->info.type == QETH_CARD_TYPE_OSD || 3555 if ((card->info.type == QETH_CARD_TYPE_OSD ||
3561 card->info.type == QETH_CARD_TYPE_OSX) && 3556 card->info.type == QETH_CARD_TYPE_OSX) &&
@@ -3583,8 +3578,8 @@ void qeth_tx_timeout(struct net_device *dev)
3583{ 3578{
3584 struct qeth_card *card; 3579 struct qeth_card *card;
3585 3580
3586 QETH_DBF_TEXT(TRACE, 4, "txtimeo");
3587 card = dev->ml_priv; 3581 card = dev->ml_priv;
3582 QETH_CARD_TEXT(card, 4, "txtimeo");
3588 card->stats.tx_errors++; 3583 card->stats.tx_errors++;
3589 qeth_schedule_recovery(card); 3584 qeth_schedule_recovery(card);
3590} 3585}
@@ -3663,7 +3658,7 @@ static int qeth_send_ipa_snmp_cmd(struct qeth_card *card,
3663{ 3658{
3664 u16 s1, s2; 3659 u16 s1, s2;
3665 3660
3666 QETH_DBF_TEXT(TRACE, 4, "sendsnmp"); 3661 QETH_CARD_TEXT(card, 4, "sendsnmp");
3667 3662
3668 memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE); 3663 memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE);
3669 memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data), 3664 memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data),
@@ -3688,7 +3683,7 @@ static int qeth_snmp_command_cb(struct qeth_card *card,
3688 unsigned char *data; 3683 unsigned char *data;
3689 __u16 data_len; 3684 __u16 data_len;
3690 3685
3691 QETH_DBF_TEXT(TRACE, 3, "snpcmdcb"); 3686 QETH_CARD_TEXT(card, 3, "snpcmdcb");
3692 3687
3693 cmd = (struct qeth_ipa_cmd *) sdata; 3688 cmd = (struct qeth_ipa_cmd *) sdata;
3694 data = (unsigned char *)((char *)cmd - reply->offset); 3689 data = (unsigned char *)((char *)cmd - reply->offset);
@@ -3696,13 +3691,13 @@ static int qeth_snmp_command_cb(struct qeth_card *card,
3696 snmp = &cmd->data.setadapterparms.data.snmp; 3691 snmp = &cmd->data.setadapterparms.data.snmp;
3697 3692
3698 if (cmd->hdr.return_code) { 3693 if (cmd->hdr.return_code) {
3699 QETH_DBF_TEXT_(TRACE, 4, "scer1%i", cmd->hdr.return_code); 3694 QETH_CARD_TEXT_(card, 4, "scer1%i", cmd->hdr.return_code);
3700 return 0; 3695 return 0;
3701 } 3696 }
3702 if (cmd->data.setadapterparms.hdr.return_code) { 3697 if (cmd->data.setadapterparms.hdr.return_code) {
3703 cmd->hdr.return_code = 3698 cmd->hdr.return_code =
3704 cmd->data.setadapterparms.hdr.return_code; 3699 cmd->data.setadapterparms.hdr.return_code;
3705 QETH_DBF_TEXT_(TRACE, 4, "scer2%i", cmd->hdr.return_code); 3700 QETH_CARD_TEXT_(card, 4, "scer2%i", cmd->hdr.return_code);
3706 return 0; 3701 return 0;
3707 } 3702 }
3708 data_len = *((__u16 *)QETH_IPA_PDU_LEN_PDU1(data)); 3703 data_len = *((__u16 *)QETH_IPA_PDU_LEN_PDU1(data));
@@ -3713,13 +3708,13 @@ static int qeth_snmp_command_cb(struct qeth_card *card,
3713 3708
3714 /* check if there is enough room in userspace */ 3709 /* check if there is enough room in userspace */
3715 if ((qinfo->udata_len - qinfo->udata_offset) < data_len) { 3710 if ((qinfo->udata_len - qinfo->udata_offset) < data_len) {
3716 QETH_DBF_TEXT_(TRACE, 4, "scer3%i", -ENOMEM); 3711 QETH_CARD_TEXT_(card, 4, "scer3%i", -ENOMEM);
3717 cmd->hdr.return_code = -ENOMEM; 3712 cmd->hdr.return_code = -ENOMEM;
3718 return 0; 3713 return 0;
3719 } 3714 }
3720 QETH_DBF_TEXT_(TRACE, 4, "snore%i", 3715 QETH_CARD_TEXT_(card, 4, "snore%i",
3721 cmd->data.setadapterparms.hdr.used_total); 3716 cmd->data.setadapterparms.hdr.used_total);
3722 QETH_DBF_TEXT_(TRACE, 4, "sseqn%i", 3717 QETH_CARD_TEXT_(card, 4, "sseqn%i",
3723 cmd->data.setadapterparms.hdr.seq_no); 3718 cmd->data.setadapterparms.hdr.seq_no);
3724 /*copy entries to user buffer*/ 3719 /*copy entries to user buffer*/
3725 if (cmd->data.setadapterparms.hdr.seq_no == 1) { 3720 if (cmd->data.setadapterparms.hdr.seq_no == 1) {
@@ -3733,9 +3728,9 @@ static int qeth_snmp_command_cb(struct qeth_card *card,
3733 } 3728 }
3734 qinfo->udata_offset += data_len; 3729 qinfo->udata_offset += data_len;
3735 /* check if all replies received ... */ 3730 /* check if all replies received ... */
3736 QETH_DBF_TEXT_(TRACE, 4, "srtot%i", 3731 QETH_CARD_TEXT_(card, 4, "srtot%i",
3737 cmd->data.setadapterparms.hdr.used_total); 3732 cmd->data.setadapterparms.hdr.used_total);
3738 QETH_DBF_TEXT_(TRACE, 4, "srseq%i", 3733 QETH_CARD_TEXT_(card, 4, "srseq%i",
3739 cmd->data.setadapterparms.hdr.seq_no); 3734 cmd->data.setadapterparms.hdr.seq_no);
3740 if (cmd->data.setadapterparms.hdr.seq_no < 3735 if (cmd->data.setadapterparms.hdr.seq_no <
3741 cmd->data.setadapterparms.hdr.used_total) 3736 cmd->data.setadapterparms.hdr.used_total)
@@ -3752,7 +3747,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)
3752 struct qeth_arp_query_info qinfo = {0, }; 3747 struct qeth_arp_query_info qinfo = {0, };
3753 int rc = 0; 3748 int rc = 0;
3754 3749
3755 QETH_DBF_TEXT(TRACE, 3, "snmpcmd"); 3750 QETH_CARD_TEXT(card, 3, "snmpcmd");
3756 3751
3757 if (card->info.guestlan) 3752 if (card->info.guestlan)
3758 return -EOPNOTSUPP; 3753 return -EOPNOTSUPP;
@@ -3766,7 +3761,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata)
3766 return -EFAULT; 3761 return -EFAULT;
3767 ureq = kmalloc(req_len+sizeof(struct qeth_snmp_ureq_hdr), GFP_KERNEL); 3762 ureq = kmalloc(req_len+sizeof(struct qeth_snmp_ureq_hdr), GFP_KERNEL);
3768 if (!ureq) { 3763 if (!ureq) {
3769 QETH_DBF_TEXT(TRACE, 2, "snmpnome"); 3764 QETH_CARD_TEXT(card, 2, "snmpnome");
3770 return -ENOMEM; 3765 return -ENOMEM;
3771 } 3766 }
3772 if (copy_from_user(ureq, udata, 3767 if (copy_from_user(ureq, udata,
@@ -4120,9 +4115,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
4120 skb_len -= data_len; 4115 skb_len -= data_len;
4121 if (skb_len) { 4116 if (skb_len) {
4122 if (qeth_is_last_sbale(element)) { 4117 if (qeth_is_last_sbale(element)) {
4123 QETH_DBF_TEXT(TRACE, 4, "unexeob"); 4118 QETH_CARD_TEXT(card, 4, "unexeob");
4124 QETH_DBF_TEXT_(TRACE, 4, "%s",
4125 CARD_BUS_ID(card));
4126 QETH_DBF_TEXT(QERR, 2, "unexeob"); 4119 QETH_DBF_TEXT(QERR, 2, "unexeob");
4127 QETH_DBF_TEXT_(QERR, 2, "%s", 4120 QETH_DBF_TEXT_(QERR, 2, "%s",
4128 CARD_BUS_ID(card)); 4121 CARD_BUS_ID(card));
@@ -4147,8 +4140,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
4147 return skb; 4140 return skb;
4148no_mem: 4141no_mem:
4149 if (net_ratelimit()) { 4142 if (net_ratelimit()) {
4150 QETH_DBF_TEXT(TRACE, 2, "noskbmem"); 4143 QETH_CARD_TEXT(card, 2, "noskbmem");
4151 QETH_DBF_TEXT_(TRACE, 2, "%s", CARD_BUS_ID(card));
4152 } 4144 }
4153 card->stats.rx_dropped++; 4145 card->stats.rx_dropped++;
4154 return NULL; 4146 return NULL;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index d43f57a4ac66..e7942ccab987 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -79,7 +79,7 @@ static int qeth_l2_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
79 rc = -EOPNOTSUPP; 79 rc = -EOPNOTSUPP;
80 } 80 }
81 if (rc) 81 if (rc)
82 QETH_DBF_TEXT_(TRACE, 2, "ioce%d", rc); 82 QETH_CARD_TEXT_(card, 2, "ioce%d", rc);
83 return rc; 83 return rc;
84} 84}
85 85
@@ -130,7 +130,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
130 struct qeth_ipa_cmd *cmd; 130 struct qeth_ipa_cmd *cmd;
131 __u8 *mac; 131 __u8 *mac;
132 132
133 QETH_DBF_TEXT(TRACE, 2, "L2Sgmacb"); 133 QETH_CARD_TEXT(card, 2, "L2Sgmacb");
134 cmd = (struct qeth_ipa_cmd *) data; 134 cmd = (struct qeth_ipa_cmd *) data;
135 mac = &cmd->data.setdelmac.mac[0]; 135 mac = &cmd->data.setdelmac.mac[0];
136 /* MAC already registered, needed in couple/uncouple case */ 136 /* MAC already registered, needed in couple/uncouple case */
@@ -147,7 +147,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
147 147
148static int qeth_l2_send_setgroupmac(struct qeth_card *card, __u8 *mac) 148static int qeth_l2_send_setgroupmac(struct qeth_card *card, __u8 *mac)
149{ 149{
150 QETH_DBF_TEXT(TRACE, 2, "L2Sgmac"); 150 QETH_CARD_TEXT(card, 2, "L2Sgmac");
151 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETGMAC, 151 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETGMAC,
152 qeth_l2_send_setgroupmac_cb); 152 qeth_l2_send_setgroupmac_cb);
153} 153}
@@ -159,7 +159,7 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
159 struct qeth_ipa_cmd *cmd; 159 struct qeth_ipa_cmd *cmd;
160 __u8 *mac; 160 __u8 *mac;
161 161
162 QETH_DBF_TEXT(TRACE, 2, "L2Dgmacb"); 162 QETH_CARD_TEXT(card, 2, "L2Dgmacb");
163 cmd = (struct qeth_ipa_cmd *) data; 163 cmd = (struct qeth_ipa_cmd *) data;
164 mac = &cmd->data.setdelmac.mac[0]; 164 mac = &cmd->data.setdelmac.mac[0];
165 if (cmd->hdr.return_code) 165 if (cmd->hdr.return_code)
@@ -170,7 +170,7 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
170 170
171static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac) 171static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac)
172{ 172{
173 QETH_DBF_TEXT(TRACE, 2, "L2Dgmac"); 173 QETH_CARD_TEXT(card, 2, "L2Dgmac");
174 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELGMAC, 174 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELGMAC,
175 qeth_l2_send_delgroupmac_cb); 175 qeth_l2_send_delgroupmac_cb);
176} 176}
@@ -262,15 +262,14 @@ static int qeth_l2_send_setdelvlan_cb(struct qeth_card *card,
262{ 262{
263 struct qeth_ipa_cmd *cmd; 263 struct qeth_ipa_cmd *cmd;
264 264
265 QETH_DBF_TEXT(TRACE, 2, "L2sdvcb"); 265 QETH_CARD_TEXT(card, 2, "L2sdvcb");
266 cmd = (struct qeth_ipa_cmd *) data; 266 cmd = (struct qeth_ipa_cmd *) data;
267 if (cmd->hdr.return_code) { 267 if (cmd->hdr.return_code) {
268 QETH_DBF_MESSAGE(2, "Error in processing VLAN %i on %s: 0x%x. " 268 QETH_DBF_MESSAGE(2, "Error in processing VLAN %i on %s: 0x%x. "
269 "Continuing\n", cmd->data.setdelvlan.vlan_id, 269 "Continuing\n", cmd->data.setdelvlan.vlan_id,
270 QETH_CARD_IFNAME(card), cmd->hdr.return_code); 270 QETH_CARD_IFNAME(card), cmd->hdr.return_code);
271 QETH_DBF_TEXT_(TRACE, 2, "L2VL%4x", cmd->hdr.command); 271 QETH_CARD_TEXT_(card, 2, "L2VL%4x", cmd->hdr.command);
272 QETH_DBF_TEXT_(TRACE, 2, "L2%s", CARD_BUS_ID(card)); 272 QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code);
273 QETH_DBF_TEXT_(TRACE, 2, "err%d", cmd->hdr.return_code);
274 } 273 }
275 return 0; 274 return 0;
276} 275}
@@ -281,7 +280,7 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i,
281 struct qeth_ipa_cmd *cmd; 280 struct qeth_ipa_cmd *cmd;
282 struct qeth_cmd_buffer *iob; 281 struct qeth_cmd_buffer *iob;
283 282
284 QETH_DBF_TEXT_(TRACE, 4, "L2sdv%x", ipacmd); 283 QETH_CARD_TEXT_(card, 4, "L2sdv%x", ipacmd);
285 iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4); 284 iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
286 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 285 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
287 cmd->data.setdelvlan.vlan_id = i; 286 cmd->data.setdelvlan.vlan_id = i;
@@ -292,7 +291,7 @@ static int qeth_l2_send_setdelvlan(struct qeth_card *card, __u16 i,
292static void qeth_l2_process_vlans(struct qeth_card *card, int clear) 291static void qeth_l2_process_vlans(struct qeth_card *card, int clear)
293{ 292{
294 struct qeth_vlan_vid *id; 293 struct qeth_vlan_vid *id;
295 QETH_DBF_TEXT(TRACE, 3, "L2prcvln"); 294 QETH_CARD_TEXT(card, 3, "L2prcvln");
296 spin_lock_bh(&card->vlanlock); 295 spin_lock_bh(&card->vlanlock);
297 list_for_each_entry(id, &card->vid_list, list) { 296 list_for_each_entry(id, &card->vid_list, list) {
298 if (clear) 297 if (clear)
@@ -310,13 +309,13 @@ static void qeth_l2_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
310 struct qeth_card *card = dev->ml_priv; 309 struct qeth_card *card = dev->ml_priv;
311 struct qeth_vlan_vid *id; 310 struct qeth_vlan_vid *id;
312 311
313 QETH_DBF_TEXT_(TRACE, 4, "aid:%d", vid); 312 QETH_CARD_TEXT_(card, 4, "aid:%d", vid);
314 if (card->info.type == QETH_CARD_TYPE_OSM) { 313 if (card->info.type == QETH_CARD_TYPE_OSM) {
315 QETH_DBF_TEXT(TRACE, 3, "aidOSM"); 314 QETH_CARD_TEXT(card, 3, "aidOSM");
316 return; 315 return;
317 } 316 }
318 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) { 317 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
319 QETH_DBF_TEXT(TRACE, 3, "aidREC"); 318 QETH_CARD_TEXT(card, 3, "aidREC");
320 return; 319 return;
321 } 320 }
322 id = kmalloc(sizeof(struct qeth_vlan_vid), GFP_ATOMIC); 321 id = kmalloc(sizeof(struct qeth_vlan_vid), GFP_ATOMIC);
@@ -334,13 +333,13 @@ static void qeth_l2_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
334 struct qeth_vlan_vid *id, *tmpid = NULL; 333 struct qeth_vlan_vid *id, *tmpid = NULL;
335 struct qeth_card *card = dev->ml_priv; 334 struct qeth_card *card = dev->ml_priv;
336 335
337 QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid); 336 QETH_CARD_TEXT_(card, 4, "kid:%d", vid);
338 if (card->info.type == QETH_CARD_TYPE_OSM) { 337 if (card->info.type == QETH_CARD_TYPE_OSM) {
339 QETH_DBF_TEXT(TRACE, 3, "kidOSM"); 338 QETH_CARD_TEXT(card, 3, "kidOSM");
340 return; 339 return;
341 } 340 }
342 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) { 341 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
343 QETH_DBF_TEXT(TRACE, 3, "kidREC"); 342 QETH_CARD_TEXT(card, 3, "kidREC");
344 return; 343 return;
345 } 344 }
346 spin_lock_bh(&card->vlanlock); 345 spin_lock_bh(&card->vlanlock);
@@ -456,7 +455,7 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
456 /* else unknown */ 455 /* else unknown */
457 default: 456 default:
458 dev_kfree_skb_any(skb); 457 dev_kfree_skb_any(skb);
459 QETH_DBF_TEXT(TRACE, 3, "inbunkno"); 458 QETH_CARD_TEXT(card, 3, "inbunkno");
460 QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN); 459 QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);
461 continue; 460 continue;
462 } 461 }
@@ -474,7 +473,7 @@ static int qeth_l2_send_setdelmac(struct qeth_card *card, __u8 *mac,
474 struct qeth_ipa_cmd *cmd; 473 struct qeth_ipa_cmd *cmd;
475 struct qeth_cmd_buffer *iob; 474 struct qeth_cmd_buffer *iob;
476 475
477 QETH_DBF_TEXT(TRACE, 2, "L2sdmac"); 476 QETH_CARD_TEXT(card, 2, "L2sdmac");
478 iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4); 477 iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
479 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 478 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
480 cmd->data.setdelmac.mac_length = OSA_ADDR_LEN; 479 cmd->data.setdelmac.mac_length = OSA_ADDR_LEN;
@@ -488,10 +487,10 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
488{ 487{
489 struct qeth_ipa_cmd *cmd; 488 struct qeth_ipa_cmd *cmd;
490 489
491 QETH_DBF_TEXT(TRACE, 2, "L2Smaccb"); 490 QETH_CARD_TEXT(card, 2, "L2Smaccb");
492 cmd = (struct qeth_ipa_cmd *) data; 491 cmd = (struct qeth_ipa_cmd *) data;
493 if (cmd->hdr.return_code) { 492 if (cmd->hdr.return_code) {
494 QETH_DBF_TEXT_(TRACE, 2, "L2er%x", cmd->hdr.return_code); 493 QETH_CARD_TEXT_(card, 2, "L2er%x", cmd->hdr.return_code);
495 card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED; 494 card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
496 switch (cmd->hdr.return_code) { 495 switch (cmd->hdr.return_code) {
497 case IPA_RC_L2_DUP_MAC: 496 case IPA_RC_L2_DUP_MAC:
@@ -523,7 +522,7 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
523 522
524static int qeth_l2_send_setmac(struct qeth_card *card, __u8 *mac) 523static int qeth_l2_send_setmac(struct qeth_card *card, __u8 *mac)
525{ 524{
526 QETH_DBF_TEXT(TRACE, 2, "L2Setmac"); 525 QETH_CARD_TEXT(card, 2, "L2Setmac");
527 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC, 526 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC,
528 qeth_l2_send_setmac_cb); 527 qeth_l2_send_setmac_cb);
529} 528}
@@ -534,10 +533,10 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card,
534{ 533{
535 struct qeth_ipa_cmd *cmd; 534 struct qeth_ipa_cmd *cmd;
536 535
537 QETH_DBF_TEXT(TRACE, 2, "L2Dmaccb"); 536 QETH_CARD_TEXT(card, 2, "L2Dmaccb");
538 cmd = (struct qeth_ipa_cmd *) data; 537 cmd = (struct qeth_ipa_cmd *) data;
539 if (cmd->hdr.return_code) { 538 if (cmd->hdr.return_code) {
540 QETH_DBF_TEXT_(TRACE, 2, "err%d", cmd->hdr.return_code); 539 QETH_CARD_TEXT_(card, 2, "err%d", cmd->hdr.return_code);
541 cmd->hdr.return_code = -EIO; 540 cmd->hdr.return_code = -EIO;
542 return 0; 541 return 0;
543 } 542 }
@@ -548,7 +547,7 @@ static int qeth_l2_send_delmac_cb(struct qeth_card *card,
548 547
549static int qeth_l2_send_delmac(struct qeth_card *card, __u8 *mac) 548static int qeth_l2_send_delmac(struct qeth_card *card, __u8 *mac)
550{ 549{
551 QETH_DBF_TEXT(TRACE, 2, "L2Delmac"); 550 QETH_CARD_TEXT(card, 2, "L2Delmac");
552 if (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED)) 551 if (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))
553 return 0; 552 return 0;
554 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELVMAC, 553 return qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELVMAC,
@@ -594,23 +593,22 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
594 struct qeth_card *card = dev->ml_priv; 593 struct qeth_card *card = dev->ml_priv;
595 int rc = 0; 594 int rc = 0;
596 595
597 QETH_DBF_TEXT(TRACE, 3, "setmac"); 596 QETH_CARD_TEXT(card, 3, "setmac");
598 597
599 if (qeth_l2_verify_dev(dev) != QETH_REAL_CARD) { 598 if (qeth_l2_verify_dev(dev) != QETH_REAL_CARD) {
600 QETH_DBF_TEXT(TRACE, 3, "setmcINV"); 599 QETH_CARD_TEXT(card, 3, "setmcINV");
601 return -EOPNOTSUPP; 600 return -EOPNOTSUPP;
602 } 601 }
603 602
604 if (card->info.type == QETH_CARD_TYPE_OSN || 603 if (card->info.type == QETH_CARD_TYPE_OSN ||
605 card->info.type == QETH_CARD_TYPE_OSM || 604 card->info.type == QETH_CARD_TYPE_OSM ||
606 card->info.type == QETH_CARD_TYPE_OSX) { 605 card->info.type == QETH_CARD_TYPE_OSX) {
607 QETH_DBF_TEXT(TRACE, 3, "setmcTYP"); 606 QETH_CARD_TEXT(card, 3, "setmcTYP");
608 return -EOPNOTSUPP; 607 return -EOPNOTSUPP;
609 } 608 }
610 QETH_DBF_TEXT_(TRACE, 3, "%s", CARD_BUS_ID(card)); 609 QETH_CARD_HEX(card, 3, addr->sa_data, OSA_ADDR_LEN);
611 QETH_DBF_HEX(TRACE, 3, addr->sa_data, OSA_ADDR_LEN);
612 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) { 610 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
613 QETH_DBF_TEXT(TRACE, 3, "setmcREC"); 611 QETH_CARD_TEXT(card, 3, "setmcREC");
614 return -ERESTARTSYS; 612 return -ERESTARTSYS;
615 } 613 }
616 rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]); 614 rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]);
@@ -627,7 +625,7 @@ static void qeth_l2_set_multicast_list(struct net_device *dev)
627 if (card->info.type == QETH_CARD_TYPE_OSN) 625 if (card->info.type == QETH_CARD_TYPE_OSN)
628 return ; 626 return ;
629 627
630 QETH_DBF_TEXT(TRACE, 3, "setmulti"); 628 QETH_CARD_TEXT(card, 3, "setmulti");
631 if (qeth_threads_running(card, QETH_RECOVER_THREAD) && 629 if (qeth_threads_running(card, QETH_RECOVER_THREAD) &&
632 (card->state != CARD_STATE_UP)) 630 (card->state != CARD_STATE_UP))
633 return; 631 return;
@@ -771,11 +769,10 @@ static void qeth_l2_qdio_input_handler(struct ccw_device *ccwdev,
771 card->perf_stats.inbound_start_time = qeth_get_micros(); 769 card->perf_stats.inbound_start_time = qeth_get_micros();
772 } 770 }
773 if (qdio_err & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) { 771 if (qdio_err & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) {
774 QETH_DBF_TEXT(TRACE, 1, "qdinchk"); 772 QETH_CARD_TEXT(card, 1, "qdinchk");
775 QETH_DBF_TEXT_(TRACE, 1, "%s", CARD_BUS_ID(card)); 773 QETH_CARD_TEXT_(card, 1, "%04X%04X", first_element,
776 QETH_DBF_TEXT_(TRACE, 1, "%04X%04X", first_element,
777 count); 774 count);
778 QETH_DBF_TEXT_(TRACE, 1, "%04X", queue); 775 QETH_CARD_TEXT_(card, 1, "%04X", queue);
779 qeth_schedule_recovery(card); 776 qeth_schedule_recovery(card);
780 return; 777 return;
781 } 778 }
@@ -799,13 +796,13 @@ static int qeth_l2_open(struct net_device *dev)
799{ 796{
800 struct qeth_card *card = dev->ml_priv; 797 struct qeth_card *card = dev->ml_priv;
801 798
802 QETH_DBF_TEXT(TRACE, 4, "qethopen"); 799 QETH_CARD_TEXT(card, 4, "qethopen");
803 if (card->state != CARD_STATE_SOFTSETUP) 800 if (card->state != CARD_STATE_SOFTSETUP)
804 return -ENODEV; 801 return -ENODEV;
805 802
806 if ((card->info.type != QETH_CARD_TYPE_OSN) && 803 if ((card->info.type != QETH_CARD_TYPE_OSN) &&
807 (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))) { 804 (!(card->info.mac_bits & QETH_LAYER2_MAC_REGISTERED))) {
808 QETH_DBF_TEXT(TRACE, 4, "nomacadr"); 805 QETH_CARD_TEXT(card, 4, "nomacadr");
809 return -EPERM; 806 return -EPERM;
810 } 807 }
811 card->data.state = CH_STATE_UP; 808 card->data.state = CH_STATE_UP;
@@ -822,7 +819,7 @@ static int qeth_l2_stop(struct net_device *dev)
822{ 819{
823 struct qeth_card *card = dev->ml_priv; 820 struct qeth_card *card = dev->ml_priv;
824 821
825 QETH_DBF_TEXT(TRACE, 4, "qethstop"); 822 QETH_CARD_TEXT(card, 4, "qethstop");
826 netif_tx_disable(dev); 823 netif_tx_disable(dev);
827 if (card->state == CARD_STATE_UP) 824 if (card->state == CARD_STATE_UP)
828 card->state = CARD_STATE_SOFTSETUP; 825 card->state = CARD_STATE_SOFTSETUP;
@@ -1074,11 +1071,10 @@ static int qeth_l2_recover(void *ptr)
1074 int rc = 0; 1071 int rc = 0;
1075 1072
1076 card = (struct qeth_card *) ptr; 1073 card = (struct qeth_card *) ptr;
1077 QETH_DBF_TEXT(TRACE, 2, "recover1"); 1074 QETH_CARD_TEXT(card, 2, "recover1");
1078 QETH_DBF_HEX(TRACE, 2, &card, sizeof(void *));
1079 if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD)) 1075 if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD))
1080 return 0; 1076 return 0;
1081 QETH_DBF_TEXT(TRACE, 2, "recover2"); 1077 QETH_CARD_TEXT(card, 2, "recover2");
1082 dev_warn(&card->gdev->dev, 1078 dev_warn(&card->gdev->dev,
1083 "A recovery process has been started for the device\n"); 1079 "A recovery process has been started for the device\n");
1084 card->use_hard_stop = 1; 1080 card->use_hard_stop = 1;
@@ -1181,12 +1177,12 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len,
1181 unsigned long flags; 1177 unsigned long flags;
1182 int rc = 0; 1178 int rc = 0;
1183 1179
1184 QETH_DBF_TEXT(TRACE, 5, "osndctrd"); 1180 QETH_CARD_TEXT(card, 5, "osndctrd");
1185 1181
1186 wait_event(card->wait_q, 1182 wait_event(card->wait_q,
1187 atomic_cmpxchg(&card->write.irq_pending, 0, 1) == 0); 1183 atomic_cmpxchg(&card->write.irq_pending, 0, 1) == 0);
1188 qeth_prepare_control_data(card, len, iob); 1184 qeth_prepare_control_data(card, len, iob);
1189 QETH_DBF_TEXT(TRACE, 6, "osnoirqp"); 1185 QETH_CARD_TEXT(card, 6, "osnoirqp");
1190 spin_lock_irqsave(get_ccwdev_lock(card->write.ccwdev), flags); 1186 spin_lock_irqsave(get_ccwdev_lock(card->write.ccwdev), flags);
1191 rc = ccw_device_start(card->write.ccwdev, &card->write.ccw, 1187 rc = ccw_device_start(card->write.ccwdev, &card->write.ccw,
1192 (addr_t) iob, 0, 0); 1188 (addr_t) iob, 0, 0);
@@ -1194,7 +1190,7 @@ static int qeth_osn_send_control_data(struct qeth_card *card, int len,
1194 if (rc) { 1190 if (rc) {
1195 QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: " 1191 QETH_DBF_MESSAGE(2, "qeth_osn_send_control_data: "
1196 "ccw_device_start rc = %i\n", rc); 1192 "ccw_device_start rc = %i\n", rc);
1197 QETH_DBF_TEXT_(TRACE, 2, " err%d", rc); 1193 QETH_CARD_TEXT_(card, 2, " err%d", rc);
1198 qeth_release_buffer(iob->channel, iob); 1194 qeth_release_buffer(iob->channel, iob);
1199 atomic_set(&card->write.irq_pending, 0); 1195 atomic_set(&card->write.irq_pending, 0);
1200 wake_up(&card->wait_q); 1196 wake_up(&card->wait_q);
@@ -1207,7 +1203,7 @@ static int qeth_osn_send_ipa_cmd(struct qeth_card *card,
1207{ 1203{
1208 u16 s1, s2; 1204 u16 s1, s2;
1209 1205
1210 QETH_DBF_TEXT(TRACE, 4, "osndipa"); 1206 QETH_CARD_TEXT(card, 4, "osndipa");
1211 1207
1212 qeth_prepare_ipa_cmd(card, iob, QETH_PROT_OSN2); 1208 qeth_prepare_ipa_cmd(card, iob, QETH_PROT_OSN2);
1213 s1 = (u16)(IPA_PDU_HEADER_SIZE + data_len); 1209 s1 = (u16)(IPA_PDU_HEADER_SIZE + data_len);
@@ -1225,12 +1221,12 @@ int qeth_osn_assist(struct net_device *dev, void *data, int data_len)
1225 struct qeth_card *card; 1221 struct qeth_card *card;
1226 int rc; 1222 int rc;
1227 1223
1228 QETH_DBF_TEXT(TRACE, 2, "osnsdmc");
1229 if (!dev) 1224 if (!dev)
1230 return -ENODEV; 1225 return -ENODEV;
1231 card = dev->ml_priv; 1226 card = dev->ml_priv;
1232 if (!card) 1227 if (!card)
1233 return -ENODEV; 1228 return -ENODEV;
1229 QETH_CARD_TEXT(card, 2, "osnsdmc");
1234 if ((card->state != CARD_STATE_UP) && 1230 if ((card->state != CARD_STATE_UP) &&
1235 (card->state != CARD_STATE_SOFTSETUP)) 1231 (card->state != CARD_STATE_SOFTSETUP))
1236 return -ENODEV; 1232 return -ENODEV;
@@ -1247,13 +1243,13 @@ int qeth_osn_register(unsigned char *read_dev_no, struct net_device **dev,
1247{ 1243{
1248 struct qeth_card *card; 1244 struct qeth_card *card;
1249 1245
1250 QETH_DBF_TEXT(TRACE, 2, "osnreg");
1251 *dev = qeth_l2_netdev_by_devno(read_dev_no); 1246 *dev = qeth_l2_netdev_by_devno(read_dev_no);
1252 if (*dev == NULL) 1247 if (*dev == NULL)
1253 return -ENODEV; 1248 return -ENODEV;
1254 card = (*dev)->ml_priv; 1249 card = (*dev)->ml_priv;
1255 if (!card) 1250 if (!card)
1256 return -ENODEV; 1251 return -ENODEV;
1252 QETH_CARD_TEXT(card, 2, "osnreg");
1257 if ((assist_cb == NULL) || (data_cb == NULL)) 1253 if ((assist_cb == NULL) || (data_cb == NULL))
1258 return -EINVAL; 1254 return -EINVAL;
1259 card->osn_info.assist_cb = assist_cb; 1255 card->osn_info.assist_cb = assist_cb;
@@ -1266,12 +1262,12 @@ void qeth_osn_deregister(struct net_device *dev)
1266{ 1262{
1267 struct qeth_card *card; 1263 struct qeth_card *card;
1268 1264
1269 QETH_DBF_TEXT(TRACE, 2, "osndereg");
1270 if (!dev) 1265 if (!dev)
1271 return; 1266 return;
1272 card = dev->ml_priv; 1267 card = dev->ml_priv;
1273 if (!card) 1268 if (!card)
1274 return; 1269 return;
1270 QETH_CARD_TEXT(card, 2, "osndereg");
1275 card->osn_info.assist_cb = NULL; 1271 card->osn_info.assist_cb = NULL;
1276 card->osn_info.data_cb = NULL; 1272 card->osn_info.data_cb = NULL;
1277 return; 1273 return;
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 61adae21a464..b5733e405ed9 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -287,7 +287,7 @@ static int __qeth_l3_insert_ip_todo(struct qeth_card *card,
287 addr->users += add ? 1 : -1; 287 addr->users += add ? 1 : -1;
288 if (add && (addr->type == QETH_IP_TYPE_NORMAL) && 288 if (add && (addr->type == QETH_IP_TYPE_NORMAL) &&
289 qeth_l3_is_addr_covered_by_ipato(card, addr)) { 289 qeth_l3_is_addr_covered_by_ipato(card, addr)) {
290 QETH_DBF_TEXT(TRACE, 2, "tkovaddr"); 290 QETH_CARD_TEXT(card, 2, "tkovaddr");
291 addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG; 291 addr->set_flags |= QETH_IPA_SETIP_TAKEOVER_FLAG;
292 } 292 }
293 list_add_tail(&addr->entry, card->ip_tbd_list); 293 list_add_tail(&addr->entry, card->ip_tbd_list);
@@ -301,13 +301,13 @@ static int qeth_l3_delete_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
301 unsigned long flags; 301 unsigned long flags;
302 int rc = 0; 302 int rc = 0;
303 303
304 QETH_DBF_TEXT(TRACE, 4, "delip"); 304 QETH_CARD_TEXT(card, 4, "delip");
305 305
306 if (addr->proto == QETH_PROT_IPV4) 306 if (addr->proto == QETH_PROT_IPV4)
307 QETH_DBF_HEX(TRACE, 4, &addr->u.a4.addr, 4); 307 QETH_CARD_HEX(card, 4, &addr->u.a4.addr, 4);
308 else { 308 else {
309 QETH_DBF_HEX(TRACE, 4, &addr->u.a6.addr, 8); 309 QETH_CARD_HEX(card, 4, &addr->u.a6.addr, 8);
310 QETH_DBF_HEX(TRACE, 4, ((char *)&addr->u.a6.addr) + 8, 8); 310 QETH_CARD_HEX(card, 4, ((char *)&addr->u.a6.addr) + 8, 8);
311 } 311 }
312 spin_lock_irqsave(&card->ip_lock, flags); 312 spin_lock_irqsave(&card->ip_lock, flags);
313 rc = __qeth_l3_insert_ip_todo(card, addr, 0); 313 rc = __qeth_l3_insert_ip_todo(card, addr, 0);
@@ -320,12 +320,12 @@ static int qeth_l3_add_ip(struct qeth_card *card, struct qeth_ipaddr *addr)
320 unsigned long flags; 320 unsigned long flags;
321 int rc = 0; 321 int rc = 0;
322 322
323 QETH_DBF_TEXT(TRACE, 4, "addip"); 323 QETH_CARD_TEXT(card, 4, "addip");
324 if (addr->proto == QETH_PROT_IPV4) 324 if (addr->proto == QETH_PROT_IPV4)
325 QETH_DBF_HEX(TRACE, 4, &addr->u.a4.addr, 4); 325 QETH_CARD_HEX(card, 4, &addr->u.a4.addr, 4);
326 else { 326 else {
327 QETH_DBF_HEX(TRACE, 4, &addr->u.a6.addr, 8); 327 QETH_CARD_HEX(card, 4, &addr->u.a6.addr, 8);
328 QETH_DBF_HEX(TRACE, 4, ((char *)&addr->u.a6.addr) + 8, 8); 328 QETH_CARD_HEX(card, 4, ((char *)&addr->u.a6.addr) + 8, 8);
329 } 329 }
330 spin_lock_irqsave(&card->ip_lock, flags); 330 spin_lock_irqsave(&card->ip_lock, flags);
331 rc = __qeth_l3_insert_ip_todo(card, addr, 1); 331 rc = __qeth_l3_insert_ip_todo(card, addr, 1);
@@ -353,10 +353,10 @@ static void qeth_l3_delete_mc_addresses(struct qeth_card *card)
353 struct qeth_ipaddr *iptodo; 353 struct qeth_ipaddr *iptodo;
354 unsigned long flags; 354 unsigned long flags;
355 355
356 QETH_DBF_TEXT(TRACE, 4, "delmc"); 356 QETH_CARD_TEXT(card, 4, "delmc");
357 iptodo = qeth_l3_get_addr_buffer(QETH_PROT_IPV4); 357 iptodo = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
358 if (!iptodo) { 358 if (!iptodo) {
359 QETH_DBF_TEXT(TRACE, 2, "dmcnomem"); 359 QETH_CARD_TEXT(card, 2, "dmcnomem");
360 return; 360 return;
361 } 361 }
362 iptodo->type = QETH_IP_TYPE_DEL_ALL_MC; 362 iptodo->type = QETH_IP_TYPE_DEL_ALL_MC;
@@ -457,8 +457,8 @@ static void qeth_l3_set_ip_addr_list(struct qeth_card *card)
457 unsigned long flags; 457 unsigned long flags;
458 int rc; 458 int rc;
459 459
460 QETH_DBF_TEXT(TRACE, 2, "sdiplist"); 460 QETH_CARD_TEXT(card, 2, "sdiplist");
461 QETH_DBF_HEX(TRACE, 2, &card, sizeof(void *)); 461 QETH_CARD_HEX(card, 2, &card, sizeof(void *));
462 462
463 if (card->options.sniffer) 463 if (card->options.sniffer)
464 return; 464 return;
@@ -466,7 +466,7 @@ static void qeth_l3_set_ip_addr_list(struct qeth_card *card)
466 tbd_list = card->ip_tbd_list; 466 tbd_list = card->ip_tbd_list;
467 card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_ATOMIC); 467 card->ip_tbd_list = kmalloc(sizeof(struct list_head), GFP_ATOMIC);
468 if (!card->ip_tbd_list) { 468 if (!card->ip_tbd_list) {
469 QETH_DBF_TEXT(TRACE, 0, "silnomem"); 469 QETH_CARD_TEXT(card, 0, "silnomem");
470 card->ip_tbd_list = tbd_list; 470 card->ip_tbd_list = tbd_list;
471 spin_unlock_irqrestore(&card->ip_lock, flags); 471 spin_unlock_irqrestore(&card->ip_lock, flags);
472 return; 472 return;
@@ -517,7 +517,7 @@ static void qeth_l3_clear_ip_list(struct qeth_card *card, int clean,
517 struct qeth_ipaddr *addr, *tmp; 517 struct qeth_ipaddr *addr, *tmp;
518 unsigned long flags; 518 unsigned long flags;
519 519
520 QETH_DBF_TEXT(TRACE, 4, "clearip"); 520 QETH_CARD_TEXT(card, 4, "clearip");
521 if (recover && card->options.sniffer) 521 if (recover && card->options.sniffer)
522 return; 522 return;
523 spin_lock_irqsave(&card->ip_lock, flags); 523 spin_lock_irqsave(&card->ip_lock, flags);
@@ -577,7 +577,7 @@ static int qeth_l3_send_setdelmc(struct qeth_card *card,
577 struct qeth_cmd_buffer *iob; 577 struct qeth_cmd_buffer *iob;
578 struct qeth_ipa_cmd *cmd; 578 struct qeth_ipa_cmd *cmd;
579 579
580 QETH_DBF_TEXT(TRACE, 4, "setdelmc"); 580 QETH_CARD_TEXT(card, 4, "setdelmc");
581 581
582 iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto); 582 iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);
583 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 583 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
@@ -615,8 +615,8 @@ static int qeth_l3_send_setdelip(struct qeth_card *card,
615 struct qeth_ipa_cmd *cmd; 615 struct qeth_ipa_cmd *cmd;
616 __u8 netmask[16]; 616 __u8 netmask[16];
617 617
618 QETH_DBF_TEXT(TRACE, 4, "setdelip"); 618 QETH_CARD_TEXT(card, 4, "setdelip");
619 QETH_DBF_TEXT_(TRACE, 4, "flags%02X", flags); 619 QETH_CARD_TEXT_(card, 4, "flags%02X", flags);
620 620
621 iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto); 621 iob = qeth_get_ipacmd_buffer(card, ipacmd, addr->proto);
622 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 622 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
@@ -645,7 +645,7 @@ static int qeth_l3_send_setrouting(struct qeth_card *card,
645 struct qeth_ipa_cmd *cmd; 645 struct qeth_ipa_cmd *cmd;
646 struct qeth_cmd_buffer *iob; 646 struct qeth_cmd_buffer *iob;
647 647
648 QETH_DBF_TEXT(TRACE, 4, "setroutg"); 648 QETH_CARD_TEXT(card, 4, "setroutg");
649 iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETRTG, prot); 649 iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETRTG, prot);
650 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 650 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
651 cmd->data.setrtg.type = (type); 651 cmd->data.setrtg.type = (type);
@@ -689,7 +689,7 @@ int qeth_l3_setrouting_v4(struct qeth_card *card)
689{ 689{
690 int rc; 690 int rc;
691 691
692 QETH_DBF_TEXT(TRACE, 3, "setrtg4"); 692 QETH_CARD_TEXT(card, 3, "setrtg4");
693 693
694 qeth_l3_correct_routing_type(card, &card->options.route4.type, 694 qeth_l3_correct_routing_type(card, &card->options.route4.type,
695 QETH_PROT_IPV4); 695 QETH_PROT_IPV4);
@@ -709,7 +709,7 @@ int qeth_l3_setrouting_v6(struct qeth_card *card)
709{ 709{
710 int rc = 0; 710 int rc = 0;
711 711
712 QETH_DBF_TEXT(TRACE, 3, "setrtg6"); 712 QETH_CARD_TEXT(card, 3, "setrtg6");
713#ifdef CONFIG_QETH_IPV6 713#ifdef CONFIG_QETH_IPV6
714 714
715 if (!qeth_is_supported(card, IPA_IPV6)) 715 if (!qeth_is_supported(card, IPA_IPV6))
@@ -753,7 +753,7 @@ int qeth_l3_add_ipato_entry(struct qeth_card *card,
753 unsigned long flags; 753 unsigned long flags;
754 int rc = 0; 754 int rc = 0;
755 755
756 QETH_DBF_TEXT(TRACE, 2, "addipato"); 756 QETH_CARD_TEXT(card, 2, "addipato");
757 spin_lock_irqsave(&card->ip_lock, flags); 757 spin_lock_irqsave(&card->ip_lock, flags);
758 list_for_each_entry(ipatoe, &card->ipato.entries, entry) { 758 list_for_each_entry(ipatoe, &card->ipato.entries, entry) {
759 if (ipatoe->proto != new->proto) 759 if (ipatoe->proto != new->proto)
@@ -778,7 +778,7 @@ void qeth_l3_del_ipato_entry(struct qeth_card *card,
778 struct qeth_ipato_entry *ipatoe, *tmp; 778 struct qeth_ipato_entry *ipatoe, *tmp;
779 unsigned long flags; 779 unsigned long flags;
780 780
781 QETH_DBF_TEXT(TRACE, 2, "delipato"); 781 QETH_CARD_TEXT(card, 2, "delipato");
782 spin_lock_irqsave(&card->ip_lock, flags); 782 spin_lock_irqsave(&card->ip_lock, flags);
783 list_for_each_entry_safe(ipatoe, tmp, &card->ipato.entries, entry) { 783 list_for_each_entry_safe(ipatoe, tmp, &card->ipato.entries, entry) {
784 if (ipatoe->proto != proto) 784 if (ipatoe->proto != proto)
@@ -806,11 +806,11 @@ int qeth_l3_add_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
806 ipaddr = qeth_l3_get_addr_buffer(proto); 806 ipaddr = qeth_l3_get_addr_buffer(proto);
807 if (ipaddr) { 807 if (ipaddr) {
808 if (proto == QETH_PROT_IPV4) { 808 if (proto == QETH_PROT_IPV4) {
809 QETH_DBF_TEXT(TRACE, 2, "addvipa4"); 809 QETH_CARD_TEXT(card, 2, "addvipa4");
810 memcpy(&ipaddr->u.a4.addr, addr, 4); 810 memcpy(&ipaddr->u.a4.addr, addr, 4);
811 ipaddr->u.a4.mask = 0; 811 ipaddr->u.a4.mask = 0;
812 } else if (proto == QETH_PROT_IPV6) { 812 } else if (proto == QETH_PROT_IPV6) {
813 QETH_DBF_TEXT(TRACE, 2, "addvipa6"); 813 QETH_CARD_TEXT(card, 2, "addvipa6");
814 memcpy(&ipaddr->u.a6.addr, addr, 16); 814 memcpy(&ipaddr->u.a6.addr, addr, 16);
815 ipaddr->u.a6.pfxlen = 0; 815 ipaddr->u.a6.pfxlen = 0;
816 } 816 }
@@ -841,11 +841,11 @@ void qeth_l3_del_vipa(struct qeth_card *card, enum qeth_prot_versions proto,
841 ipaddr = qeth_l3_get_addr_buffer(proto); 841 ipaddr = qeth_l3_get_addr_buffer(proto);
842 if (ipaddr) { 842 if (ipaddr) {
843 if (proto == QETH_PROT_IPV4) { 843 if (proto == QETH_PROT_IPV4) {
844 QETH_DBF_TEXT(TRACE, 2, "delvipa4"); 844 QETH_CARD_TEXT(card, 2, "delvipa4");
845 memcpy(&ipaddr->u.a4.addr, addr, 4); 845 memcpy(&ipaddr->u.a4.addr, addr, 4);
846 ipaddr->u.a4.mask = 0; 846 ipaddr->u.a4.mask = 0;
847 } else if (proto == QETH_PROT_IPV6) { 847 } else if (proto == QETH_PROT_IPV6) {
848 QETH_DBF_TEXT(TRACE, 2, "delvipa6"); 848 QETH_CARD_TEXT(card, 2, "delvipa6");
849 memcpy(&ipaddr->u.a6.addr, addr, 16); 849 memcpy(&ipaddr->u.a6.addr, addr, 16);
850 ipaddr->u.a6.pfxlen = 0; 850 ipaddr->u.a6.pfxlen = 0;
851 } 851 }
@@ -870,11 +870,11 @@ int qeth_l3_add_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
870 ipaddr = qeth_l3_get_addr_buffer(proto); 870 ipaddr = qeth_l3_get_addr_buffer(proto);
871 if (ipaddr) { 871 if (ipaddr) {
872 if (proto == QETH_PROT_IPV4) { 872 if (proto == QETH_PROT_IPV4) {
873 QETH_DBF_TEXT(TRACE, 2, "addrxip4"); 873 QETH_CARD_TEXT(card, 2, "addrxip4");
874 memcpy(&ipaddr->u.a4.addr, addr, 4); 874 memcpy(&ipaddr->u.a4.addr, addr, 4);
875 ipaddr->u.a4.mask = 0; 875 ipaddr->u.a4.mask = 0;
876 } else if (proto == QETH_PROT_IPV6) { 876 } else if (proto == QETH_PROT_IPV6) {
877 QETH_DBF_TEXT(TRACE, 2, "addrxip6"); 877 QETH_CARD_TEXT(card, 2, "addrxip6");
878 memcpy(&ipaddr->u.a6.addr, addr, 16); 878 memcpy(&ipaddr->u.a6.addr, addr, 16);
879 ipaddr->u.a6.pfxlen = 0; 879 ipaddr->u.a6.pfxlen = 0;
880 } 880 }
@@ -905,11 +905,11 @@ void qeth_l3_del_rxip(struct qeth_card *card, enum qeth_prot_versions proto,
905 ipaddr = qeth_l3_get_addr_buffer(proto); 905 ipaddr = qeth_l3_get_addr_buffer(proto);
906 if (ipaddr) { 906 if (ipaddr) {
907 if (proto == QETH_PROT_IPV4) { 907 if (proto == QETH_PROT_IPV4) {
908 QETH_DBF_TEXT(TRACE, 2, "addrxip4"); 908 QETH_CARD_TEXT(card, 2, "addrxip4");
909 memcpy(&ipaddr->u.a4.addr, addr, 4); 909 memcpy(&ipaddr->u.a4.addr, addr, 4);
910 ipaddr->u.a4.mask = 0; 910 ipaddr->u.a4.mask = 0;
911 } else if (proto == QETH_PROT_IPV6) { 911 } else if (proto == QETH_PROT_IPV6) {
912 QETH_DBF_TEXT(TRACE, 2, "addrxip6"); 912 QETH_CARD_TEXT(card, 2, "addrxip6");
913 memcpy(&ipaddr->u.a6.addr, addr, 16); 913 memcpy(&ipaddr->u.a6.addr, addr, 16);
914 ipaddr->u.a6.pfxlen = 0; 914 ipaddr->u.a6.pfxlen = 0;
915 } 915 }
@@ -929,15 +929,15 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,
929 int cnt = 3; 929 int cnt = 3;
930 930
931 if (addr->proto == QETH_PROT_IPV4) { 931 if (addr->proto == QETH_PROT_IPV4) {
932 QETH_DBF_TEXT(TRACE, 2, "setaddr4"); 932 QETH_CARD_TEXT(card, 2, "setaddr4");
933 QETH_DBF_HEX(TRACE, 3, &addr->u.a4.addr, sizeof(int)); 933 QETH_CARD_HEX(card, 3, &addr->u.a4.addr, sizeof(int));
934 } else if (addr->proto == QETH_PROT_IPV6) { 934 } else if (addr->proto == QETH_PROT_IPV6) {
935 QETH_DBF_TEXT(TRACE, 2, "setaddr6"); 935 QETH_CARD_TEXT(card, 2, "setaddr6");
936 QETH_DBF_HEX(TRACE, 3, &addr->u.a6.addr, 8); 936 QETH_CARD_HEX(card, 3, &addr->u.a6.addr, 8);
937 QETH_DBF_HEX(TRACE, 3, ((char *)&addr->u.a6.addr) + 8, 8); 937 QETH_CARD_HEX(card, 3, ((char *)&addr->u.a6.addr) + 8, 8);
938 } else { 938 } else {
939 QETH_DBF_TEXT(TRACE, 2, "setaddr?"); 939 QETH_CARD_TEXT(card, 2, "setaddr?");
940 QETH_DBF_HEX(TRACE, 3, addr, sizeof(struct qeth_ipaddr)); 940 QETH_CARD_HEX(card, 3, addr, sizeof(struct qeth_ipaddr));
941 } 941 }
942 do { 942 do {
943 if (addr->is_multicast) 943 if (addr->is_multicast)
@@ -946,10 +946,10 @@ static int qeth_l3_register_addr_entry(struct qeth_card *card,
946 rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_SETIP, 946 rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_SETIP,
947 addr->set_flags); 947 addr->set_flags);
948 if (rc) 948 if (rc)
949 QETH_DBF_TEXT(TRACE, 2, "failed"); 949 QETH_CARD_TEXT(card, 2, "failed");
950 } while ((--cnt > 0) && rc); 950 } while ((--cnt > 0) && rc);
951 if (rc) { 951 if (rc) {
952 QETH_DBF_TEXT(TRACE, 2, "FAILED"); 952 QETH_CARD_TEXT(card, 2, "FAILED");
953 qeth_l3_ipaddr_to_string(addr->proto, (u8 *)&addr->u, buf); 953 qeth_l3_ipaddr_to_string(addr->proto, (u8 *)&addr->u, buf);
954 dev_warn(&card->gdev->dev, 954 dev_warn(&card->gdev->dev,
955 "Registering IP address %s failed\n", buf); 955 "Registering IP address %s failed\n", buf);
@@ -963,15 +963,15 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card,
963 int rc = 0; 963 int rc = 0;
964 964
965 if (addr->proto == QETH_PROT_IPV4) { 965 if (addr->proto == QETH_PROT_IPV4) {
966 QETH_DBF_TEXT(TRACE, 2, "deladdr4"); 966 QETH_CARD_TEXT(card, 2, "deladdr4");
967 QETH_DBF_HEX(TRACE, 3, &addr->u.a4.addr, sizeof(int)); 967 QETH_CARD_HEX(card, 3, &addr->u.a4.addr, sizeof(int));
968 } else if (addr->proto == QETH_PROT_IPV6) { 968 } else if (addr->proto == QETH_PROT_IPV6) {
969 QETH_DBF_TEXT(TRACE, 2, "deladdr6"); 969 QETH_CARD_TEXT(card, 2, "deladdr6");
970 QETH_DBF_HEX(TRACE, 3, &addr->u.a6.addr, 8); 970 QETH_CARD_HEX(card, 3, &addr->u.a6.addr, 8);
971 QETH_DBF_HEX(TRACE, 3, ((char *)&addr->u.a6.addr) + 8, 8); 971 QETH_CARD_HEX(card, 3, ((char *)&addr->u.a6.addr) + 8, 8);
972 } else { 972 } else {
973 QETH_DBF_TEXT(TRACE, 2, "deladdr?"); 973 QETH_CARD_TEXT(card, 2, "deladdr?");
974 QETH_DBF_HEX(TRACE, 3, addr, sizeof(struct qeth_ipaddr)); 974 QETH_CARD_HEX(card, 3, addr, sizeof(struct qeth_ipaddr));
975 } 975 }
976 if (addr->is_multicast) 976 if (addr->is_multicast)
977 rc = qeth_l3_send_setdelmc(card, addr, IPA_CMD_DELIPM); 977 rc = qeth_l3_send_setdelmc(card, addr, IPA_CMD_DELIPM);
@@ -979,7 +979,7 @@ static int qeth_l3_deregister_addr_entry(struct qeth_card *card,
979 rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_DELIP, 979 rc = qeth_l3_send_setdelip(card, addr, IPA_CMD_DELIP,
980 addr->del_flags); 980 addr->del_flags);
981 if (rc) 981 if (rc)
982 QETH_DBF_TEXT(TRACE, 2, "failed"); 982 QETH_CARD_TEXT(card, 2, "failed");
983 983
984 return rc; 984 return rc;
985} 985}
@@ -1012,7 +1012,7 @@ static int qeth_l3_send_setadp_mode(struct qeth_card *card, __u32 command,
1012 struct qeth_cmd_buffer *iob; 1012 struct qeth_cmd_buffer *iob;
1013 struct qeth_ipa_cmd *cmd; 1013 struct qeth_ipa_cmd *cmd;
1014 1014
1015 QETH_DBF_TEXT(TRACE, 4, "adpmode"); 1015 QETH_CARD_TEXT(card, 4, "adpmode");
1016 1016
1017 iob = qeth_get_adapter_cmd(card, command, 1017 iob = qeth_get_adapter_cmd(card, command,
1018 sizeof(struct qeth_ipacmd_setadpparms)); 1018 sizeof(struct qeth_ipacmd_setadpparms));
@@ -1027,7 +1027,7 @@ static int qeth_l3_setadapter_hstr(struct qeth_card *card)
1027{ 1027{
1028 int rc; 1028 int rc;
1029 1029
1030 QETH_DBF_TEXT(TRACE, 4, "adphstr"); 1030 QETH_CARD_TEXT(card, 4, "adphstr");
1031 1031
1032 if (qeth_adp_supported(card, IPA_SETADP_SET_BROADCAST_MODE)) { 1032 if (qeth_adp_supported(card, IPA_SETADP_SET_BROADCAST_MODE)) {
1033 rc = qeth_l3_send_setadp_mode(card, 1033 rc = qeth_l3_send_setadp_mode(card,
@@ -1093,7 +1093,7 @@ static int qeth_l3_default_setassparms_cb(struct qeth_card *card,
1093{ 1093{
1094 struct qeth_ipa_cmd *cmd; 1094 struct qeth_ipa_cmd *cmd;
1095 1095
1096 QETH_DBF_TEXT(TRACE, 4, "defadpcb"); 1096 QETH_CARD_TEXT(card, 4, "defadpcb");
1097 1097
1098 cmd = (struct qeth_ipa_cmd *) data; 1098 cmd = (struct qeth_ipa_cmd *) data;
1099 if (cmd->hdr.return_code == 0) { 1099 if (cmd->hdr.return_code == 0) {
@@ -1106,13 +1106,13 @@ static int qeth_l3_default_setassparms_cb(struct qeth_card *card,
1106 if (cmd->data.setassparms.hdr.assist_no == IPA_INBOUND_CHECKSUM && 1106 if (cmd->data.setassparms.hdr.assist_no == IPA_INBOUND_CHECKSUM &&
1107 cmd->data.setassparms.hdr.command_code == IPA_CMD_ASS_START) { 1107 cmd->data.setassparms.hdr.command_code == IPA_CMD_ASS_START) {
1108 card->info.csum_mask = cmd->data.setassparms.data.flags_32bit; 1108 card->info.csum_mask = cmd->data.setassparms.data.flags_32bit;
1109 QETH_DBF_TEXT_(TRACE, 3, "csum:%d", card->info.csum_mask); 1109 QETH_CARD_TEXT_(card, 3, "csum:%d", card->info.csum_mask);
1110 } 1110 }
1111 if (cmd->data.setassparms.hdr.assist_no == IPA_OUTBOUND_CHECKSUM && 1111 if (cmd->data.setassparms.hdr.assist_no == IPA_OUTBOUND_CHECKSUM &&
1112 cmd->data.setassparms.hdr.command_code == IPA_CMD_ASS_START) { 1112 cmd->data.setassparms.hdr.command_code == IPA_CMD_ASS_START) {
1113 card->info.tx_csum_mask = 1113 card->info.tx_csum_mask =
1114 cmd->data.setassparms.data.flags_32bit; 1114 cmd->data.setassparms.data.flags_32bit;
1115 QETH_DBF_TEXT_(TRACE, 3, "tcsu:%d", card->info.tx_csum_mask); 1115 QETH_CARD_TEXT_(card, 3, "tcsu:%d", card->info.tx_csum_mask);
1116 } 1116 }
1117 1117
1118 return 0; 1118 return 0;
@@ -1125,7 +1125,7 @@ static struct qeth_cmd_buffer *qeth_l3_get_setassparms_cmd(
1125 struct qeth_cmd_buffer *iob; 1125 struct qeth_cmd_buffer *iob;
1126 struct qeth_ipa_cmd *cmd; 1126 struct qeth_ipa_cmd *cmd;
1127 1127
1128 QETH_DBF_TEXT(TRACE, 4, "getasscm"); 1128 QETH_CARD_TEXT(card, 4, "getasscm");
1129 iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETASSPARMS, prot); 1129 iob = qeth_get_ipacmd_buffer(card, IPA_CMD_SETASSPARMS, prot);
1130 1130
1131 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 1131 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
@@ -1147,7 +1147,7 @@ static int qeth_l3_send_setassparms(struct qeth_card *card,
1147 int rc; 1147 int rc;
1148 struct qeth_ipa_cmd *cmd; 1148 struct qeth_ipa_cmd *cmd;
1149 1149
1150 QETH_DBF_TEXT(TRACE, 4, "sendassp"); 1150 QETH_CARD_TEXT(card, 4, "sendassp");
1151 1151
1152 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); 1152 cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
1153 if (len <= sizeof(__u32)) 1153 if (len <= sizeof(__u32))
@@ -1166,7 +1166,7 @@ static int qeth_l3_send_simple_setassparms_ipv6(struct qeth_card *card,
1166 int rc; 1166 int rc;
1167 struct qeth_cmd_buffer *iob; 1167 struct qeth_cmd_buffer *iob;
1168 1168
1169 QETH_DBF_TEXT(TRACE, 4, "simassp6"); 1169 QETH_CARD_TEXT(card, 4, "simassp6");
1170 iob = qeth_l3_get_setassparms_cmd(card, ipa_func, cmd_code, 1170 iob = qeth_l3_get_setassparms_cmd(card, ipa_func, cmd_code,
1171 0, QETH_PROT_IPV6); 1171 0, QETH_PROT_IPV6);
1172 rc = qeth_l3_send_setassparms(card, iob, 0, 0, 1172 rc = qeth_l3_send_setassparms(card, iob, 0, 0,
@@ -1182,7 +1182,7 @@ static int qeth_l3_send_simple_setassparms(struct qeth_card *card,
1182 int length = 0; 1182 int length = 0;
1183 struct qeth_cmd_buffer *iob; 1183 struct qeth_cmd_buffer *iob;
1184 1184
1185 QETH_DBF_TEXT(TRACE, 4, "simassp4"); 1185 QETH_CARD_TEXT(card, 4, "simassp4");
1186 if (data) 1186 if (data)
1187 length = sizeof(__u32); 1187 length = sizeof(__u32);
1188 iob = qeth_l3_get_setassparms_cmd(card, ipa_func, cmd_code, 1188 iob = qeth_l3_get_setassparms_cmd(card, ipa_func, cmd_code,
@@ -1196,7 +1196,7 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
1196{ 1196{
1197 int rc; 1197 int rc;
1198 1198
1199 QETH_DBF_TEXT(TRACE, 3, "ipaarp"); 1199 QETH_CARD_TEXT(card, 3, "ipaarp");
1200 1200
1201 if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { 1201 if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
1202 dev_info(&card->gdev->dev, 1202 dev_info(&card->gdev->dev,
@@ -1218,7 +1218,7 @@ static int qeth_l3_start_ipa_ip_fragmentation(struct qeth_card *card)
1218{ 1218{
1219 int rc; 1219 int rc;
1220 1220
1221 QETH_DBF_TEXT(TRACE, 3, "ipaipfrg"); 1221 QETH_CARD_TEXT(card, 3, "ipaipfrg");
1222 1222
1223 if (!qeth_is_supported(card, IPA_IP_FRAGMENTATION)) { 1223 if (!qeth_is_supported(card, IPA_IP_FRAGMENTATION)) {
1224 dev_info(&card->gdev->dev, 1224 dev_info(&card->gdev->dev,
@@ -1243,7 +1243,7 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
1243{ 1243{
1244 int rc; 1244 int rc;
1245 1245
1246 QETH_DBF_TEXT(TRACE, 3, "stsrcmac"); 1246 QETH_CARD_TEXT(card, 3, "stsrcmac");
1247 1247
1248 if (!qeth_is_supported(card, IPA_SOURCE_MAC)) { 1248 if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
1249 dev_info(&card->gdev->dev, 1249 dev_info(&card->gdev->dev,
@@ -1265,7 +1265,7 @@ static int qeth_l3_start_ipa_vlan(struct qeth_card *card)
1265{ 1265{
1266 int rc = 0; 1266 int rc = 0;
1267 1267
1268 QETH_DBF_TEXT(TRACE, 3, "strtvlan"); 1268 QETH_CARD_TEXT(card, 3, "strtvlan");
1269 1269
1270 if (!qeth_is_supported(card, IPA_FULL_VLAN)) { 1270 if (!qeth_is_supported(card, IPA_FULL_VLAN)) {
1271 dev_info(&card->gdev->dev, 1271 dev_info(&card->gdev->dev,
@@ -1289,7 +1289,7 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
1289{ 1289{
1290 int rc; 1290 int rc;
1291 1291
1292 QETH_DBF_TEXT(TRACE, 3, "stmcast"); 1292 QETH_CARD_TEXT(card, 3, "stmcast");
1293 1293
1294 if (!qeth_is_supported(card, IPA_MULTICASTING)) { 1294 if (!qeth_is_supported(card, IPA_MULTICASTING)) {
1295 dev_info(&card->gdev->dev, 1295 dev_info(&card->gdev->dev,
@@ -1349,7 +1349,7 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
1349{ 1349{
1350 int rc; 1350 int rc;
1351 1351
1352 QETH_DBF_TEXT(TRACE, 3, "softipv6"); 1352 QETH_CARD_TEXT(card, 3, "softipv6");
1353 1353
1354 if (card->info.type == QETH_CARD_TYPE_IQD) 1354 if (card->info.type == QETH_CARD_TYPE_IQD)
1355 goto out; 1355 goto out;
@@ -1395,7 +1395,7 @@ static int qeth_l3_start_ipa_ipv6(struct qeth_card *card)
1395{ 1395{
1396 int rc = 0; 1396 int rc = 0;
1397 1397
1398 QETH_DBF_TEXT(TRACE, 3, "strtipv6"); 1398 QETH_CARD_TEXT(card, 3, "strtipv6");
1399 1399
1400 if (!qeth_is_supported(card, IPA_IPV6)) { 1400 if (!qeth_is_supported(card, IPA_IPV6)) {
1401 dev_info(&card->gdev->dev, 1401 dev_info(&card->gdev->dev,
@@ -1412,7 +1412,7 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
1412{ 1412{
1413 int rc; 1413 int rc;
1414 1414
1415 QETH_DBF_TEXT(TRACE, 3, "stbrdcst"); 1415 QETH_CARD_TEXT(card, 3, "stbrdcst");
1416 card->info.broadcast_capable = 0; 1416 card->info.broadcast_capable = 0;
1417 if (!qeth_is_supported(card, IPA_FILTERING)) { 1417 if (!qeth_is_supported(card, IPA_FILTERING)) {
1418 dev_info(&card->gdev->dev, 1418 dev_info(&card->gdev->dev,
@@ -1512,7 +1512,7 @@ static int qeth_l3_start_ipa_checksum(struct qeth_card *card)
1512{ 1512{
1513 int rc = 0; 1513 int rc = 0;
1514 1514
1515 QETH_DBF_TEXT(TRACE, 3, "strtcsum"); 1515 QETH_CARD_TEXT(card, 3, "strtcsum");
1516 1516
1517 if (card->options.checksum_type == NO_CHECKSUMMING) { 1517 if (card->options.checksum_type == NO_CHECKSUMMING) {
1518 dev_info(&card->gdev->dev, 1518 dev_info(&card->gdev->dev,
@@ -1569,7 +1569,7 @@ static int qeth_l3_start_ipa_tso(struct qeth_card *card)
1569{ 1569{
1570 int rc; 1570 int rc;
1571 1571
1572 QETH_DBF_TEXT(TRACE, 3, "sttso"); 1572 QETH_CARD_TEXT(card, 3, "sttso");
1573 1573
1574 if (!qeth_is_supported(card, IPA_OUTBOUND_TSO)) { 1574 if (!qeth_is_supported(card, IPA_OUTBOUND_TSO)) {
1575 dev_info(&card->gdev->dev, 1575 dev_info(&card->gdev->dev,
@@ -1596,7 +1596,7 @@ static int qeth_l3_start_ipa_tso(struct qeth_card *card)
1596 1596
1597static int qeth_l3_start_ipassists(struct qeth_card *card) 1597static int qeth_l3_start_ipassists(struct qeth_card *card)
1598{ 1598{
1599 QETH_DBF_TEXT(TRACE, 3, "strtipas"); 1599 QETH_CARD_TEXT(card, 3, "strtipas");
1600 1600
1601 qeth_set_access_ctrl_online(card); /* go on*/ 1601 qeth_set_access_ctrl_online(card); /* go on*/
1602 qeth_l3_start_ipa_arp_processing(card); /* go on*/ 1602 qeth_l3_start_ipa_arp_processing(card); /* go on*/
@@ -1619,7 +1619,7 @@ static int qeth_l3_put_unique_id(struct qeth_card *card)
1619 struct qeth_cmd_buffer *iob; 1619 struct qeth_cmd_buffer *iob;
1620 struct qeth_ipa_cmd *cmd; 1620 struct qeth_ipa_cmd *cmd;
1621 1621
1622 QETH_DBF_TEXT(TRACE, 2, "puniqeid"); 1622 QETH_CARD_TEXT(card, 2, "puniqeid");
1623 1623
1624 if ((card->info.unique_id & UNIQUE_ID_NOT_BY_CARD) == 1624 if ((card->info.unique_id & UNIQUE_ID_NOT_BY_CARD) ==
1625 UNIQUE_ID_NOT_BY_CARD) 1625 UNIQUE_ID_NOT_BY_CARD)
@@ -1723,7 +1723,7 @@ qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply,
1723 cmd = (struct qeth_ipa_cmd *)data; 1723 cmd = (struct qeth_ipa_cmd *)data;
1724 rc = cmd->hdr.return_code; 1724 rc = cmd->hdr.return_code;
1725 if (rc) 1725 if (rc)
1726 QETH_DBF_TEXT_(TRACE, 2, "dxter%x", rc); 1726 QETH_CARD_TEXT_(card, 2, "dxter%x", rc);
1727 switch (cmd->data.diagass.action) { 1727 switch (cmd->data.diagass.action) {
1728 case QETH_DIAGS_CMD_TRACE_QUERY: 1728 case QETH_DIAGS_CMD_TRACE_QUERY:
1729 break; 1729 break;
@@ -1800,7 +1800,7 @@ static void qeth_l3_add_mc(struct qeth_card *card, struct in_device *in4_dev)
1800 struct ip_mc_list *im4; 1800 struct ip_mc_list *im4;
1801 char buf[MAX_ADDR_LEN]; 1801 char buf[MAX_ADDR_LEN];
1802 1802
1803 QETH_DBF_TEXT(TRACE, 4, "addmc"); 1803 QETH_CARD_TEXT(card, 4, "addmc");
1804 for (im4 = in4_dev->mc_list; im4; im4 = im4->next) { 1804 for (im4 = in4_dev->mc_list; im4; im4 = im4->next) {
1805 qeth_l3_get_mac_for_ipm(im4->multiaddr, buf, in4_dev->dev); 1805 qeth_l3_get_mac_for_ipm(im4->multiaddr, buf, in4_dev->dev);
1806 ipm = qeth_l3_get_addr_buffer(QETH_PROT_IPV4); 1806 ipm = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
@@ -1820,7 +1820,7 @@ static void qeth_l3_add_vlan_mc(struct qeth_card *card)
1820 struct vlan_group *vg; 1820 struct vlan_group *vg;
1821 int i; 1821 int i;
1822 1822
1823 QETH_DBF_TEXT(TRACE, 4, "addmcvl"); 1823 QETH_CARD_TEXT(card, 4, "addmcvl");
1824 if (!qeth_is_supported(card, IPA_FULL_VLAN) || (card->vlangrp == NULL)) 1824 if (!qeth_is_supported(card, IPA_FULL_VLAN) || (card->vlangrp == NULL))
1825 return; 1825 return;
1826 1826
@@ -1844,7 +1844,7 @@ static void qeth_l3_add_multicast_ipv4(struct qeth_card *card)
1844{ 1844{
1845 struct in_device *in4_dev; 1845 struct in_device *in4_dev;
1846 1846
1847 QETH_DBF_TEXT(TRACE, 4, "chkmcv4"); 1847 QETH_CARD_TEXT(card, 4, "chkmcv4");
1848 in4_dev = in_dev_get(card->dev); 1848 in4_dev = in_dev_get(card->dev);
1849 if (in4_dev == NULL) 1849 if (in4_dev == NULL)
1850 return; 1850 return;
@@ -1862,7 +1862,7 @@ static void qeth_l3_add_mc6(struct qeth_card *card, struct inet6_dev *in6_dev)
1862 struct ifmcaddr6 *im6; 1862 struct ifmcaddr6 *im6;
1863 char buf[MAX_ADDR_LEN]; 1863 char buf[MAX_ADDR_LEN];
1864 1864
1865 QETH_DBF_TEXT(TRACE, 4, "addmc6"); 1865 QETH_CARD_TEXT(card, 4, "addmc6");
1866 for (im6 = in6_dev->mc_list; im6 != NULL; im6 = im6->next) { 1866 for (im6 = in6_dev->mc_list; im6 != NULL; im6 = im6->next) {
1867 ndisc_mc_map(&im6->mca_addr, buf, in6_dev->dev, 0); 1867 ndisc_mc_map(&im6->mca_addr, buf, in6_dev->dev, 0);
1868 ipm = qeth_l3_get_addr_buffer(QETH_PROT_IPV6); 1868 ipm = qeth_l3_get_addr_buffer(QETH_PROT_IPV6);
@@ -1883,7 +1883,7 @@ static void qeth_l3_add_vlan_mc6(struct qeth_card *card)
1883 struct vlan_group *vg; 1883 struct vlan_group *vg;
1884 int i; 1884 int i;
1885 1885
1886 QETH_DBF_TEXT(TRACE, 4, "admc6vl"); 1886 QETH_CARD_TEXT(card, 4, "admc6vl");
1887 if (!qeth_is_supported(card, IPA_FULL_VLAN) || (card->vlangrp == NULL)) 1887 if (!qeth_is_supported(card, IPA_FULL_VLAN) || (card->vlangrp == NULL))
1888 return; 1888 return;
1889 1889
@@ -1907,7 +1907,7 @@ static void qeth_l3_add_multicast_ipv6(struct qeth_card *card)
1907{ 1907{
1908 struct inet6_dev *in6_dev; 1908 struct inet6_dev *in6_dev;
1909 1909
1910 QETH_DBF_TEXT(TRACE, 4, "chkmcv6"); 1910 QETH_CARD_TEXT(card, 4, "chkmcv6");
1911 if (!qeth_is_supported(card, IPA_IPV6)) 1911 if (!qeth_is_supported(card, IPA_IPV6))
1912 return ; 1912 return ;
1913 in6_dev = in6_dev_get(card->dev); 1913 in6_dev = in6_dev_get(card->dev);
@@ -1928,7 +1928,7 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card,
1928 struct in_ifaddr *ifa; 1928 struct in_ifaddr *ifa;
1929 struct qeth_ipaddr *addr; 1929 struct qeth_ipaddr *addr;
1930 1930
1931 QETH_DBF_TEXT(TRACE, 4, "frvaddr4"); 1931 QETH_CARD_TEXT(card, 4, "frvaddr4");
1932 1932
1933 in_dev = in_dev_get(vlan_group_get_device(card->vlangrp, vid)); 1933 in_dev = in_dev_get(vlan_group_get_device(card->vlangrp, vid));
1934 if (!in_dev) 1934 if (!in_dev)
@@ -1954,7 +1954,7 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card,
1954 struct inet6_ifaddr *ifa; 1954 struct inet6_ifaddr *ifa;
1955 struct qeth_ipaddr *addr; 1955 struct qeth_ipaddr *addr;
1956 1956
1957 QETH_DBF_TEXT(TRACE, 4, "frvaddr6"); 1957 QETH_CARD_TEXT(card, 4, "frvaddr6");
1958 1958
1959 in6_dev = in6_dev_get(vlan_group_get_device(card->vlangrp, vid)); 1959 in6_dev = in6_dev_get(vlan_group_get_device(card->vlangrp, vid));
1960 if (!in6_dev) 1960 if (!in6_dev)
@@ -1989,7 +1989,7 @@ static void qeth_l3_vlan_rx_register(struct net_device *dev,
1989 struct qeth_card *card = dev->ml_priv; 1989 struct qeth_card *card = dev->ml_priv;
1990 unsigned long flags; 1990 unsigned long flags;
1991 1991
1992 QETH_DBF_TEXT(TRACE, 4, "vlanreg"); 1992 QETH_CARD_TEXT(card, 4, "vlanreg");
1993 spin_lock_irqsave(&card->vlanlock, flags); 1993 spin_lock_irqsave(&card->vlanlock, flags);
1994 card->vlangrp = grp; 1994 card->vlangrp = grp;
1995 spin_unlock_irqrestore(&card->vlanlock, flags); 1995 spin_unlock_irqrestore(&card->vlanlock, flags);
@@ -2005,9 +2005,9 @@ static void qeth_l3_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
2005 struct qeth_card *card = dev->ml_priv; 2005 struct qeth_card *card = dev->ml_priv;
2006 unsigned long flags; 2006 unsigned long flags;
2007 2007
2008 QETH_DBF_TEXT_(TRACE, 4, "kid:%d", vid); 2008 QETH_CARD_TEXT_(card, 4, "kid:%d", vid);
2009 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) { 2009 if (qeth_wait_for_threads(card, QETH_RECOVER_THREAD)) {
2010 QETH_DBF_TEXT(TRACE, 3, "kidREC"); 2010 QETH_CARD_TEXT(card, 3, "kidREC");
2011 return; 2011 return;
2012 } 2012 }
2013 spin_lock_irqsave(&card->vlanlock, flags); 2013 spin_lock_irqsave(&card->vlanlock, flags);
@@ -2162,7 +2162,7 @@ static void qeth_l3_process_inbound_buffer(struct qeth_card *card,
2162 break; 2162 break;
2163 default: 2163 default:
2164 dev_kfree_skb_any(skb); 2164 dev_kfree_skb_any(skb);
2165 QETH_DBF_TEXT(TRACE, 3, "inbunkno"); 2165 QETH_CARD_TEXT(card, 3, "inbunkno");
2166 QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN); 2166 QETH_DBF_HEX(CTRL, 3, hdr, QETH_DBF_CTRL_LEN);
2167 continue; 2167 continue;
2168 } 2168 }
@@ -2229,7 +2229,8 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
2229 card = vlan_dev_real_dev(dev)->ml_priv; 2229 card = vlan_dev_real_dev(dev)->ml_priv;
2230 if (card && card->options.layer2) 2230 if (card && card->options.layer2)
2231 card = NULL; 2231 card = NULL;
2232 QETH_DBF_TEXT_(TRACE, 4, "%d", rc); 2232 if (card)
2233 QETH_CARD_TEXT_(card, 4, "%d", rc);
2233 return card ; 2234 return card ;
2234} 2235}
2235 2236
@@ -2307,10 +2308,10 @@ qeth_l3_handle_promisc_mode(struct qeth_card *card)
2307 } else if (card->options.sniffer && /* HiperSockets trace */ 2308 } else if (card->options.sniffer && /* HiperSockets trace */
2308 qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST)) { 2309 qeth_adp_supported(card, IPA_SETADP_SET_DIAG_ASSIST)) {
2309 if (dev->flags & IFF_PROMISC) { 2310 if (dev->flags & IFF_PROMISC) {
2310 QETH_DBF_TEXT(TRACE, 3, "+promisc"); 2311 QETH_CARD_TEXT(card, 3, "+promisc");
2311 qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_ENABLE); 2312 qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_ENABLE);
2312 } else { 2313 } else {
2313 QETH_DBF_TEXT(TRACE, 3, "-promisc"); 2314 QETH_CARD_TEXT(card, 3, "-promisc");
2314 qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_DISABLE); 2315 qeth_diags_trace(card, QETH_DIAGS_CMD_TRACE_DISABLE);
2315 } 2316 }
2316 } 2317 }
@@ -2320,7 +2321,7 @@ static void qeth_l3_set_multicast_list(struct net_device *dev)
2320{ 2321{
2321 struct qeth_card *card = dev->ml_priv; 2322 struct qeth_card *card = dev->ml_priv;
2322 2323
2323 QETH_DBF_TEXT(TRACE, 3, "setmulti"); 2324 QETH_CARD_TEXT(card, 3, "setmulti");
2324 if (qeth_threads_running(card, QETH_RECOVER_THREAD) && 2325 if (qeth_threads_running(card, QETH_RECOVER_THREAD) &&
2325 (card->state != CARD_STATE_UP)) 2326 (card->state != CARD_STATE_UP))
2326 return; 2327 return;
@@ -2365,7 +2366,7 @@ static int qeth_l3_arp_set_no_entries(struct qeth_card *card, int no_entries)
2365 int tmp; 2366 int tmp;
2366 int rc; 2367 int rc;
2367 2368
2368 QETH_DBF_TEXT(TRACE, 3, "arpstnoe"); 2369 QETH_CARD_TEXT(card, 3, "arpstnoe");
2369 2370
2370 /* 2371 /*
2371 * currently GuestLAN only supports the ARP assist function 2372 * currently GuestLAN only supports the ARP assist function
@@ -2417,17 +2418,17 @@ static int qeth_l3_arp_query_cb(struct qeth_card *card,
2417 int uentry_size; 2418 int uentry_size;
2418 int i; 2419 int i;
2419 2420
2420 QETH_DBF_TEXT(TRACE, 4, "arpquecb"); 2421 QETH_CARD_TEXT(card, 4, "arpquecb");
2421 2422
2422 qinfo = (struct qeth_arp_query_info *) reply->param; 2423 qinfo = (struct qeth_arp_query_info *) reply->param;
2423 cmd = (struct qeth_ipa_cmd *) data; 2424 cmd = (struct qeth_ipa_cmd *) data;
2424 if (cmd->hdr.return_code) { 2425 if (cmd->hdr.return_code) {
2425 QETH_DBF_TEXT_(TRACE, 4, "qaer1%i", cmd->hdr.return_code); 2426 QETH_CARD_TEXT_(card, 4, "qaer1%i", cmd->hdr.return_code);
2426 return 0; 2427 return 0;
2427 } 2428 }
2428 if (cmd->data.setassparms.hdr.return_code) { 2429 if (cmd->data.setassparms.hdr.return_code) {
2429 cmd->hdr.return_code = cmd->data.setassparms.hdr.return_code; 2430 cmd->hdr.return_code = cmd->data.setassparms.hdr.return_code;
2430 QETH_DBF_TEXT_(TRACE, 4, "qaer2%i", cmd->hdr.return_code); 2431 QETH_CARD_TEXT_(card, 4, "qaer2%i", cmd->hdr.return_code);
2431 return 0; 2432 return 0;
2432 } 2433 }
2433 qdata = &cmd->data.setassparms.data.query_arp; 2434 qdata = &cmd->data.setassparms.data.query_arp;
@@ -2449,14 +2450,14 @@ static int qeth_l3_arp_query_cb(struct qeth_card *card,
2449 /* check if there is enough room in userspace */ 2450 /* check if there is enough room in userspace */
2450 if ((qinfo->udata_len - qinfo->udata_offset) < 2451 if ((qinfo->udata_len - qinfo->udata_offset) <
2451 qdata->no_entries * uentry_size){ 2452 qdata->no_entries * uentry_size){
2452 QETH_DBF_TEXT_(TRACE, 4, "qaer3%i", -ENOMEM); 2453 QETH_CARD_TEXT_(card, 4, "qaer3%i", -ENOMEM);
2453 cmd->hdr.return_code = -ENOMEM; 2454 cmd->hdr.return_code = -ENOMEM;
2454 goto out_error; 2455 goto out_error;
2455 } 2456 }
2456 QETH_DBF_TEXT_(TRACE, 4, "anore%i", 2457 QETH_CARD_TEXT_(card, 4, "anore%i",
2457 cmd->data.setassparms.hdr.number_of_replies); 2458 cmd->data.setassparms.hdr.number_of_replies);
2458 QETH_DBF_TEXT_(TRACE, 4, "aseqn%i", cmd->data.setassparms.hdr.seq_no); 2459 QETH_CARD_TEXT_(card, 4, "aseqn%i", cmd->data.setassparms.hdr.seq_no);
2459 QETH_DBF_TEXT_(TRACE, 4, "anoen%i", qdata->no_entries); 2460 QETH_CARD_TEXT_(card, 4, "anoen%i", qdata->no_entries);
2460 2461
2461 if (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES) { 2462 if (qinfo->mask_bits & QETH_QARP_STRIP_ENTRIES) {
2462 /* strip off "media specific information" */ 2463 /* strip off "media specific information" */
@@ -2492,7 +2493,7 @@ static int qeth_l3_send_ipa_arp_cmd(struct qeth_card *card,
2492 unsigned long), 2493 unsigned long),
2493 void *reply_param) 2494 void *reply_param)
2494{ 2495{
2495 QETH_DBF_TEXT(TRACE, 4, "sendarp"); 2496 QETH_CARD_TEXT(card, 4, "sendarp");
2496 2497
2497 memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE); 2498 memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE);
2498 memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data), 2499 memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data),
@@ -2508,7 +2509,7 @@ static int qeth_l3_arp_query(struct qeth_card *card, char __user *udata)
2508 int tmp; 2509 int tmp;
2509 int rc; 2510 int rc;
2510 2511
2511 QETH_DBF_TEXT(TRACE, 3, "arpquery"); 2512 QETH_CARD_TEXT(card, 3, "arpquery");
2512 2513
2513 if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/ 2514 if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/
2514 IPA_ARP_PROCESSING)) { 2515 IPA_ARP_PROCESSING)) {
@@ -2551,7 +2552,7 @@ static int qeth_l3_arp_add_entry(struct qeth_card *card,
2551 int tmp; 2552 int tmp;
2552 int rc; 2553 int rc;
2553 2554
2554 QETH_DBF_TEXT(TRACE, 3, "arpadent"); 2555 QETH_CARD_TEXT(card, 3, "arpadent");
2555 2556
2556 /* 2557 /*
2557 * currently GuestLAN only supports the ARP assist function 2558 * currently GuestLAN only supports the ARP assist function
@@ -2590,7 +2591,7 @@ static int qeth_l3_arp_remove_entry(struct qeth_card *card,
2590 int tmp; 2591 int tmp;
2591 int rc; 2592 int rc;
2592 2593
2593 QETH_DBF_TEXT(TRACE, 3, "arprment"); 2594 QETH_CARD_TEXT(card, 3, "arprment");
2594 2595
2595 /* 2596 /*
2596 * currently GuestLAN only supports the ARP assist function 2597 * currently GuestLAN only supports the ARP assist function
@@ -2626,7 +2627,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)
2626 int rc; 2627 int rc;
2627 int tmp; 2628 int tmp;
2628 2629
2629 QETH_DBF_TEXT(TRACE, 3, "arpflush"); 2630 QETH_CARD_TEXT(card, 3, "arpflush");
2630 2631
2631 /* 2632 /*
2632 * currently GuestLAN only supports the ARP assist function 2633 * currently GuestLAN only supports the ARP assist function
@@ -2734,7 +2735,7 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
2734 rc = -EOPNOTSUPP; 2735 rc = -EOPNOTSUPP;
2735 } 2736 }
2736 if (rc) 2737 if (rc)
2737 QETH_DBF_TEXT_(TRACE, 2, "ioce%d", rc); 2738 QETH_CARD_TEXT_(card, 2, "ioce%d", rc);
2738 return rc; 2739 return rc;
2739} 2740}
2740 2741
@@ -3103,7 +3104,7 @@ static int qeth_l3_open(struct net_device *dev)
3103{ 3104{
3104 struct qeth_card *card = dev->ml_priv; 3105 struct qeth_card *card = dev->ml_priv;
3105 3106
3106 QETH_DBF_TEXT(TRACE, 4, "qethopen"); 3107 QETH_CARD_TEXT(card, 4, "qethopen");
3107 if (card->state != CARD_STATE_SOFTSETUP) 3108 if (card->state != CARD_STATE_SOFTSETUP)
3108 return -ENODEV; 3109 return -ENODEV;
3109 card->data.state = CH_STATE_UP; 3110 card->data.state = CH_STATE_UP;
@@ -3119,7 +3120,7 @@ static int qeth_l3_stop(struct net_device *dev)
3119{ 3120{
3120 struct qeth_card *card = dev->ml_priv; 3121 struct qeth_card *card = dev->ml_priv;
3121 3122
3122 QETH_DBF_TEXT(TRACE, 4, "qethstop"); 3123 QETH_CARD_TEXT(card, 4, "qethstop");
3123 netif_tx_disable(dev); 3124 netif_tx_disable(dev);
3124 if (card->state == CARD_STATE_UP) 3125 if (card->state == CARD_STATE_UP)
3125 card->state = CARD_STATE_SOFTSETUP; 3126 card->state = CARD_STATE_SOFTSETUP;
@@ -3312,11 +3313,10 @@ static void qeth_l3_qdio_input_handler(struct ccw_device *ccwdev,
3312 card->perf_stats.inbound_start_time = qeth_get_micros(); 3313 card->perf_stats.inbound_start_time = qeth_get_micros();
3313 } 3314 }
3314 if (qdio_err & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) { 3315 if (qdio_err & QDIO_ERROR_ACTIVATE_CHECK_CONDITION) {
3315 QETH_DBF_TEXT(TRACE, 1, "qdinchk"); 3316 QETH_CARD_TEXT(card, 1, "qdinchk");
3316 QETH_DBF_TEXT_(TRACE, 1, "%s", CARD_BUS_ID(card)); 3317 QETH_CARD_TEXT_(card, 1, "%04X%04X",
3317 QETH_DBF_TEXT_(TRACE, 1, "%04X%04X",
3318 first_element, count); 3318 first_element, count);
3319 QETH_DBF_TEXT_(TRACE, 1, "%04X", queue); 3319 QETH_CARD_TEXT_(card, 1, "%04X", queue);
3320 qeth_schedule_recovery(card); 3320 qeth_schedule_recovery(card);
3321 return; 3321 return;
3322 } 3322 }
@@ -3522,11 +3522,11 @@ static int qeth_l3_recover(void *ptr)
3522 int rc = 0; 3522 int rc = 0;
3523 3523
3524 card = (struct qeth_card *) ptr; 3524 card = (struct qeth_card *) ptr;
3525 QETH_DBF_TEXT(TRACE, 2, "recover1"); 3525 QETH_CARD_TEXT(card, 2, "recover1");
3526 QETH_DBF_HEX(TRACE, 2, &card, sizeof(void *)); 3526 QETH_CARD_HEX(card, 2, &card, sizeof(void *));
3527 if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD)) 3527 if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD))
3528 return 0; 3528 return 0;
3529 QETH_DBF_TEXT(TRACE, 2, "recover2"); 3529 QETH_CARD_TEXT(card, 2, "recover2");
3530 dev_warn(&card->gdev->dev, 3530 dev_warn(&card->gdev->dev,
3531 "A recovery process has been started for the device\n"); 3531 "A recovery process has been started for the device\n");
3532 card->use_hard_stop = 1; 3532 card->use_hard_stop = 1;
@@ -3624,8 +3624,8 @@ static int qeth_l3_ip_event(struct notifier_block *this,
3624 if (dev_net(dev) != &init_net) 3624 if (dev_net(dev) != &init_net)
3625 return NOTIFY_DONE; 3625 return NOTIFY_DONE;
3626 3626
3627 QETH_DBF_TEXT(TRACE, 3, "ipevent");
3628 card = qeth_l3_get_card_from_dev(dev); 3627 card = qeth_l3_get_card_from_dev(dev);
3628 QETH_CARD_TEXT(card, 3, "ipevent");
3629 if (!card) 3629 if (!card)
3630 return NOTIFY_DONE; 3630 return NOTIFY_DONE;
3631 3631
@@ -3671,11 +3671,11 @@ static int qeth_l3_ip6_event(struct notifier_block *this,
3671 struct qeth_ipaddr *addr; 3671 struct qeth_ipaddr *addr;
3672 struct qeth_card *card; 3672 struct qeth_card *card;
3673 3673
3674 QETH_DBF_TEXT(TRACE, 3, "ip6event");
3675 3674
3676 card = qeth_l3_get_card_from_dev(dev); 3675 card = qeth_l3_get_card_from_dev(dev);
3677 if (!card) 3676 if (!card)
3678 return NOTIFY_DONE; 3677 return NOTIFY_DONE;
3678 QETH_CARD_TEXT(card, 3, "ip6event");
3679 if (!qeth_is_supported(card, IPA_IPV6)) 3679 if (!qeth_is_supported(card, IPA_IPV6))
3680 return NOTIFY_DONE; 3680 return NOTIFY_DONE;
3681 3681
@@ -3714,7 +3714,7 @@ static int qeth_l3_register_notifiers(void)
3714{ 3714{
3715 int rc; 3715 int rc;
3716 3716
3717 QETH_DBF_TEXT(TRACE, 5, "regnotif"); 3717 QETH_DBF_TEXT(SETUP, 5, "regnotif");
3718 rc = register_inetaddr_notifier(&qeth_l3_ip_notifier); 3718 rc = register_inetaddr_notifier(&qeth_l3_ip_notifier);
3719 if (rc) 3719 if (rc)
3720 return rc; 3720 return rc;
@@ -3733,7 +3733,7 @@ static int qeth_l3_register_notifiers(void)
3733static void qeth_l3_unregister_notifiers(void) 3733static void qeth_l3_unregister_notifiers(void)
3734{ 3734{
3735 3735
3736 QETH_DBF_TEXT(TRACE, 5, "unregnot"); 3736 QETH_DBF_TEXT(SETUP, 5, "unregnot");
3737 BUG_ON(unregister_inetaddr_notifier(&qeth_l3_ip_notifier)); 3737 BUG_ON(unregister_inetaddr_notifier(&qeth_l3_ip_notifier));
3738#ifdef CONFIG_QETH_IPV6 3738#ifdef CONFIG_QETH_IPV6
3739 BUG_ON(unregister_inet6addr_notifier(&qeth_l3_ip6_notifier)); 3739 BUG_ON(unregister_inet6addr_notifier(&qeth_l3_ip6_notifier));
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 05:20:26 -0500