From abffd2ac21a694e9d416e8801b327acf338b69ec Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Fri, 5 Oct 2012 13:57:48 -0700 Subject: [PATCH] --- yaml --- r: 340911 b: refs/heads/master c: f575f65897e84018ee7163407ca5514272e11223 h: refs/heads/master i: 340909: 28e8004af2118dcca493dfff4c0aa0d80f8b5b1d 340907: 96b50cafe0102beb4c3ec8a1754b8f234cf72eaa 340903: 7f5b45718c34d0ff76a58fae24cb9630c6e88af3 340895: a97d30e1e15437d4dec8f34dbf3076a57d89777f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/cmdevt.c | 11 +++++++---- trunk/drivers/net/wireless/mwifiex/main.h | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 187c3e8804bc..9b9b027a6488 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a66205a218c4b22ced8b3326ab925136b160b01 +refs/heads/master: f575f65897e84018ee7163407ca5514272e11223 diff --git a/trunk/drivers/net/wireless/mwifiex/cmdevt.c b/trunk/drivers/net/wireless/mwifiex/cmdevt.c index 8d465107f52b..6627f9caabd0 100644 --- a/trunk/drivers/net/wireless/mwifiex/cmdevt.c +++ b/trunk/drivers/net/wireless/mwifiex/cmdevt.c @@ -918,20 +918,23 @@ mwifiex_cmd_timeout_func(unsigned long function_context) dev_err(adapter->dev, "last_cmd_index = %d\n", adapter->dbg.last_cmd_index); print_hex_dump_bytes("last_cmd_id: ", DUMP_PREFIX_OFFSET, - adapter->dbg.last_cmd_id, DBG_CMD_NUM); + adapter->dbg.last_cmd_id, + sizeof(adapter->dbg.last_cmd_id)); print_hex_dump_bytes("last_cmd_act: ", DUMP_PREFIX_OFFSET, - adapter->dbg.last_cmd_act, DBG_CMD_NUM); + adapter->dbg.last_cmd_act, + sizeof(adapter->dbg.last_cmd_act)); dev_err(adapter->dev, "last_cmd_resp_index = %d\n", adapter->dbg.last_cmd_resp_index); print_hex_dump_bytes("last_cmd_resp_id: ", DUMP_PREFIX_OFFSET, adapter->dbg.last_cmd_resp_id, - DBG_CMD_NUM); + sizeof(adapter->dbg.last_cmd_resp_id)); dev_err(adapter->dev, "last_event_index = %d\n", adapter->dbg.last_event_index); print_hex_dump_bytes("last_event: ", DUMP_PREFIX_OFFSET, - adapter->dbg.last_event, DBG_CMD_NUM); + adapter->dbg.last_event, + sizeof(adapter->dbg.last_event)); dev_err(adapter->dev, "data_sent=%d cmd_sent=%d\n", adapter->data_sent, adapter->cmd_sent); diff --git a/trunk/drivers/net/wireless/mwifiex/main.h b/trunk/drivers/net/wireless/mwifiex/main.h index c2d0ab146af5..0b747ec84c4d 100644 --- a/trunk/drivers/net/wireless/mwifiex/main.h +++ b/trunk/drivers/net/wireless/mwifiex/main.h @@ -115,8 +115,6 @@ enum { #define MWIFIEX_TYPE_DATA 0 #define MWIFIEX_TYPE_EVENT 3 -#define DBG_CMD_NUM 5 - #define MAX_BITMAP_RATES_SIZE 10 #define MAX_CHANNEL_BAND_BG 14