diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-05 12:16:39 +0900 |
commit | 8e04221029067cbaff3fc8f4daf991532afbcbaf (patch) | |
tree | 18cf757bcd315c76f5f458aa72a0a57db0a78985 /net/mac80211/driver-trace.h | |
parent | 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 (diff) | |
parent | 2c940db250c1610d95ea5331dc819b8bd4db96ae (diff) | |
download | kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.zip kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.gz kernel_samsung_aries-8e04221029067cbaff3fc8f4daf991532afbcbaf.tar.bz2 |
Merge branch 'sh/stable-updates'
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 ee94ea0..da8497e 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( |