summaryrefslogtreecommitdiff
path: root/net/mac80211/driver-trace.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-02-09 00:38:38 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-02-09 00:38:38 +0300
commit6e7e6213e4956828927c30e3ef5a42812d00c650 (patch)
tree3e13859aae5ac0a50eecd452e96849e5e373f444 /net/mac80211/driver-trace.h
parent5ffaf8a361b4c9025963959a744f21d8173c7669 (diff)
parentc0ce77b8323c1a0d4eeef97caf16c0ea971222a9 (diff)
downloadlinux-6e7e6213e4956828927c30e3ef5a42812d00c650.tar.xz
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.h2
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,
__entry->ret = ret;
__entry->action = action;
__entry->tid = tid;
- __entry->ssn = *ssn;
+ __entry->ssn = ssn ? *ssn : 0;
),
TP_printk(