diff options
author | Carsten Otte <cotte@de.ibm.com> | 2010-06-21 18:57:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-23 16:16:35 -0400 |
commit | efd5d9a407f248bc7b684513a9ce9fe1fd19b478 (patch) | |
tree | 92902a6032e9f56f9fd7fbf593c97b6974c6c6e1 /drivers/s390/net | |
parent | d829eeef58ee571a68ab51c9a67f2a94f9a9ce6c (diff) |
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>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r-- | drivers/s390/net/qeth_core.h | 1 | ||||
-rw-r--r-- | drivers/s390/net/qeth_core_main.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index 4e845a2ac83d..ebb83d782263 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h | |||
@@ -42,7 +42,6 @@ enum qeth_dbf_names { | |||
42 | QETH_DBF_SETUP, | 42 | QETH_DBF_SETUP, |
43 | QETH_DBF_QERR, | 43 | QETH_DBF_QERR, |
44 | QETH_DBF_MSG, | 44 | QETH_DBF_MSG, |
45 | QETH_DBF_MISC, | ||
46 | QETH_DBF_CTRL, | 45 | QETH_DBF_CTRL, |
47 | QETH_DBF_INFOS /* must be last element */ | 46 | QETH_DBF_INFOS /* must be last element */ |
48 | }; | 47 | }; |
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 5db2030174a7..e4655feb52cb 100644 --- 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] = { | |||
36 | 2, 1, 8, 2, &debug_hex_ascii_view, NULL}, | 36 | 2, 1, 8, 2, &debug_hex_ascii_view, NULL}, |
37 | [QETH_DBF_MSG] = {"qeth_msg", | 37 | [QETH_DBF_MSG] = {"qeth_msg", |
38 | 8, 1, 128, 3, &debug_sprintf_view, NULL}, | 38 | 8, 1, 128, 3, &debug_sprintf_view, NULL}, |
39 | [QETH_DBF_MISC] = {"qeth_misc", | ||
40 | 2, 1, 256, 2, &debug_hex_ascii_view, NULL}, | ||
41 | [QETH_DBF_CTRL] = {"qeth_control", | 39 | [QETH_DBF_CTRL] = {"qeth_control", |
42 | 8, 1, QETH_DBF_CTRL_LEN, 5, &debug_hex_ascii_view, NULL}, | 40 | 8, 1, QETH_DBF_CTRL_LEN, 5, &debug_hex_ascii_view, NULL}, |
43 | }; | 41 | }; |
@@ -4117,7 +4115,7 @@ struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card, | |||
4117 | QETH_DBF_TEXT(QERR, 2, "unexeob"); | 4115 | QETH_DBF_TEXT(QERR, 2, "unexeob"); |
4118 | QETH_DBF_TEXT_(QERR, 2, "%s", | 4116 | QETH_DBF_TEXT_(QERR, 2, "%s", |
4119 | CARD_BUS_ID(card)); | 4117 | CARD_BUS_ID(card)); |
4120 | QETH_DBF_HEX(MISC, 4, buffer, sizeof(*buffer)); | 4118 | QETH_CARD_HEX(card, 2, buffer, sizeof(void *)); |
4121 | dev_kfree_skb_any(skb); | 4119 | dev_kfree_skb_any(skb); |
4122 | card->stats.rx_errors++; | 4120 | card->stats.rx_errors++; |
4123 | return NULL; | 4121 | return NULL; |