diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 14:42:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 14:42:33 +0100 |
| commit | 744595c847cefd6ac0eec8f66e9fba95687c3f4f (patch) | |
| tree | 3d4b4e5213b584567d87f705f369808d7cfe8dbd /net | |
| parent | starfire: clean up properly if firmware loading fails (diff) | |
| parent | mac80211: fix NULL pointer dereference when ftrace is enabled (diff) | |
| download | linux-744595c847cefd6ac0eec8f66e9fba95687c3f4f.tar.xz linux-744595c847cefd6ac0eec8f66e9fba95687c3f4f.zip | |
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.h | 2 |
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( |