projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| ac0dd8b4 GKH |
1 | From e95b743536937a72e1560c85696b425c5d1a1c18 Mon Sep 17 00:00:00 2001 |
| 2 | From: Johannes Berg <johannes.berg@intel.com> | |
| 3 | Date: Fri, 6 Aug 2010 16:00:48 +0200 | |
| 4 | Subject: iwlwifi: fix TX tracer | |
| 5 | ||
| 6 | From: Johannes Berg <johannes.berg@intel.com> | |
| 7 | ||
| 8 | commit e95b743536937a72e1560c85696b425c5d1a1c18 upstream. | |
| 9 | ||
| 10 | The TX tracing code copies with the wrong length, | |
| 11 | which will typically copy too little data. Fix | |
| 12 | this by using the correct length variable. | |
| 13 | ||
| 14 | Signed-off-by: Johannes Berg <johannes.berg@intel.com> | |
| 15 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 17 | ||
| 18 | --- | |
| 19 | drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- | |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 21 | ||
| 22 | --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h | |
| 23 | +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h | |
| 24 | @@ -193,7 +193,7 @@ TRACE_EVENT(iwlwifi_dev_tx, | |
| 25 | __entry->framelen = buf0_len + buf1_len; | |
| 26 | memcpy(__get_dynamic_array(tfd), tfd, tfdlen); | |
| 27 | memcpy(__get_dynamic_array(buf0), buf0, buf0_len); | |
| 28 | - memcpy(__get_dynamic_array(buf1), buf1, buf0_len); | |
| 29 | + memcpy(__get_dynamic_array(buf1), buf1, buf1_len); | |
| 30 | ), | |
| 31 | TP_printk("[%p] TX %.2x (%zu bytes)", | |
| 32 | __entry->priv, |