diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 19:56:03 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 19:56:03 +0400 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/iwlwifi/iwl-devtrace.h | |
| parent | 03f52a0a554210d5049eeed9f1bb29047dc807cb (diff) | |
| parent | 0751f8654602e4255f0b9c17784d8100d5896010 (diff) | |
| download | linux-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-devtrace.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h index 678717bf62eb..b3fde5f7b9bc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h @@ -306,7 +306,7 @@ TRACE_EVENT(iwlwifi_dev_rx_data, memcpy(__get_dynamic_array(data), ((u8 *)rxbuf) + offs, len - offs); ), - TP_printk("[%s] TX frame data", __get_str(dev)) + TP_printk("[%s] RX frame data", __get_str(dev)) ); #undef TRACE_SYSTEM |