summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-28 05:42:33 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-28 05:42:33 -0800
commit744595c847cefd6ac0eec8f66e9fba95687c3f4f (patch)
tree3d4b4e5213b584567d87f705f369808d7cfe8dbd /net
parentc928febf4bc703ea542340e5a208e0445d998839 (diff)
parent3092ad054406f069991ca561adc74f2d9fbb6867 (diff)
downloadlinux-744595c847cefd6ac0eec8f66e9fba95687c3f4f.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-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 ee94ea0c67e9..da8497ef7063 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -680,7 +680,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(