diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2013-02-18 15:27:42 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-18 15:27:42 -0500 |
| commit | a9908ebf5ceb044eee6d9fda018d33cbf27df719 (patch) | |
| tree | 281c858c19ba5e099e9a1eed84fa67dcfb2628f4 /net/mac80211/trace.h | |
| parent | iwlwifi: dvm: improve (again) the prints in reclaim path (diff) | |
| parent | cfg80211: fix station change if TDLS isn't supported (diff) | |
| download | linux-dev-a9908ebf5ceb044eee6d9fda018d33cbf27df719.tar.xz linux-dev-a9908ebf5ceb044eee6d9fda018d33cbf27df719.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index 1183c4a4fee5..3d7cd2a0582f 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -479,7 +479,7 @@ TRACE_EVENT(drv_set_tim, TP_printk( LOCAL_PR_FMT STA_PR_FMT " set:%d", - LOCAL_PR_ARG, STA_PR_FMT, __entry->set + LOCAL_PR_ARG, STA_PR_ARG, __entry->set ) ); @@ -1684,7 +1684,7 @@ TRACE_EVENT(api_sta_block_awake, TP_printk( LOCAL_PR_FMT STA_PR_FMT " block:%d", - LOCAL_PR_ARG, STA_PR_FMT, __entry->block + LOCAL_PR_ARG, STA_PR_ARG, __entry->block ) ); @@ -1782,7 +1782,7 @@ TRACE_EVENT(api_eosp, TP_printk( LOCAL_PR_FMT STA_PR_FMT, - LOCAL_PR_ARG, STA_PR_FMT + LOCAL_PR_ARG, STA_PR_ARG ) ); |