diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 08:42:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 08:42:33 -0500 |
| commit | 744595c847cefd6ac0eec8f66e9fba95687c3f4f (patch) | |
| tree | 3d4b4e5213b584567d87f705f369808d7cfe8dbd /net | |
| parent | c928febf4bc703ea542340e5a208e0445d998839 (diff) | |
| parent | 3092ad054406f069991ca561adc74f2d9fbb6867 (diff) | |
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, | |||
| 680 | __entry->ret = ret; | 680 | __entry->ret = ret; |
| 681 | __entry->action = action; | 681 | __entry->action = action; |
| 682 | __entry->tid = tid; | 682 | __entry->tid = tid; |
| 683 | __entry->ssn = *ssn; | 683 | __entry->ssn = ssn ? *ssn : 0; |
| 684 | ), | 684 | ), |
| 685 | 685 | ||
| 686 | TP_printk( | 686 | TP_printk( |