diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-25 10:22:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-25 10:22:36 -0400 |
| commit | 9a244409d0b0cf3b1e46f1dc331f2c718597fae0 (patch) | |
| tree | 5d5aa1964a1f97cb978a33b3533134ee624f90b6 /net/wireless | |
| parent | bac9832076ee3b134bc859e07698c99276fc9459 (diff) | |
| parent | c01fac1c77a00227f706a1654317023e3f4ac7f0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/cfg.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/trace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 85474ee501e..0c524cd76c8 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -2049,7 +2049,8 @@ TRACE_EVENT(cfg80211_michael_mic_failure, MAC_ASSIGN(addr, addr); __entry->key_type = key_type; __entry->key_id = key_id; - memcpy(__entry->tsc, tsc, 6); + if (tsc) + memcpy(__entry->tsc, tsc, 6); ), TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm", NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->key_type, |