qeth: Fold qeth_misc debug area

This patch removes the misc debug area. Instead of logging the entire skb
we just log a pointer to it into the card's local debug area in
qeth_core_get_next_skb. Other then that, this debug area is not used anywhere.

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>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 4e845a2ac83d14d6020d7ae5397d2e72c34fb83c..ebb83d78226324b8c374ddcf2d4fce3df3838181 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -42,7 +42,6 @@ enum qeth_dbf_names {
        QETH_DBF_SETUP,
        QETH_DBF_QERR,
        QETH_DBF_MSG,
-       QETH_DBF_MISC,
        QETH_DBF_CTRL,
        QETH_DBF_INFOS  /* must be last element */
 };

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 5db2030174a7cf298cb669dd7c768361988ed2d3..e4655feb52cb1d0be0815ab12e86b05abe091e59 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -36,8 +36,6 @@ struct qeth_dbf_info qeth_dbf[QETH_DBF_INFOS] = {
                                2, 1,   8, 2, &debug_hex_ascii_view, NULL},
        [QETH_DBF_MSG]   = {"qeth_msg",
                                8, 1, 128, 3, &debug_sprintf_view,   NULL},
-       [QETH_DBF_MISC]  = {"qeth_misc",
-                               2, 1, 256, 2, &debug_hex_ascii_view, NULL},
        [QETH_DBF_CTRL]  = {"qeth_control",
                8, 1, QETH_DBF_CTRL_LEN, 5, &debug_hex_ascii_view, NULL},
 };
@@ -4117,7 +4115,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,
                                QETH_DBF_TEXT(QERR, 2, "unexeob");
                                QETH_DBF_TEXT_(QERR, 2, "%s",
                                        CARD_BUS_ID(card));
-                               QETH_DBF_HEX(MISC, 4, buffer, sizeof(*buffer));
+                               QETH_CARD_HEX(card, 2, buffer, sizeof(void *));
                                dev_kfree_skb_any(skb);
                                card->stats.rx_errors++;
                                return NULL;