diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-02-08 16:38:38 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-08 16:38:38 -0500 |
| commit | 6e7e6213e4956828927c30e3ef5a42812d00c650 (patch) | |
| tree | 3e13859aae5ac0a50eecd452e96849e5e373f444 /net/mac80211/driver-trace.h | |
| parent | 5ffaf8a361b4c9025963959a744f21d8173c7669 (diff) | |
| parent | c0ce77b8323c1a0d4eeef97caf16c0ea971222a9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/scan.c
Diffstat (limited to 'net/mac80211/driver-trace.h')
| -rw-r--r-- | net/mac80211/driver-trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index fefa6e6b01bc..502424b2538a 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h | |||
| @@ -708,7 +708,7 @@ TRACE_EVENT(drv_ampdu_action, | |||
| 708 | __entry->ret = ret; | 708 | __entry->ret = ret; |
| 709 | __entry->action = action; | 709 | __entry->action = action; |
| 710 | __entry->tid = tid; | 710 | __entry->tid = tid; |
| 711 | __entry->ssn = *ssn; | 711 | __entry->ssn = ssn ? *ssn : 0; |
| 712 | ), | 712 | ), |
| 713 | 713 | ||
| 714 | TP_printk( | 714 | TP_printk( |