From 4223043ba68003fa7da75f309505a1e47120dcf0 Mon Sep 17 00:00:00 2001 From: Carsten Otte Date: Mon, 21 Jun 2010 22:57:07 +0000 Subject: [PATCH] --- yaml --- r: 203138 b: refs/heads/master c: efd5d9a407f248bc7b684513a9ce9fe1fd19b478 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_core.h | 1 - trunk/drivers/s390/net/qeth_core_main.c | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a79b49e92356..851fff713567 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d829eeef58ee571a68ab51c9a67f2a94f9a9ce6c +refs/heads/master: efd5d9a407f248bc7b684513a9ce9fe1fd19b478 diff --git a/trunk/drivers/s390/net/qeth_core.h b/trunk/drivers/s390/net/qeth_core.h index 4e845a2ac83d..ebb83d782263 100644 --- a/trunk/drivers/s390/net/qeth_core.h +++ b/trunk/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/trunk/drivers/s390/net/qeth_core_main.c b/trunk/drivers/s390/net/qeth_core_main.c index 5db2030174a7..e4655feb52cb 100644 --- a/trunk/drivers/s390/net/qeth_core_main.c +++ b/trunk/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;