diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 22:50:17 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 22:50:17 +0400 |
| commit | fae172136c0cfc80cb4b13620c861688e671650a (patch) | |
| tree | 3dc683dcd8beb5e61361fadd74736742fd35c70b /net/wireless/trace.h | |
| parent | 36ef0b473fbf43d5db23eea4616cc1d18cec245f (diff) | |
| parent | 370bd005937c0e00f9104a602f9fe1dd6b21b54b (diff) | |
| download | linux-fae172136c0cfc80cb4b13620c861688e671650a.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/trace.h')
| -rw-r--r-- | net/wireless/trace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index b7a531380e19..7586de77a2f8 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -27,7 +27,8 @@ #define WIPHY_PR_ARG __entry->wiphy_name #define WDEV_ENTRY __field(u32, id) -#define WDEV_ASSIGN (__entry->id) = (wdev ? wdev->identifier : 0) +#define WDEV_ASSIGN (__entry->id) = (!IS_ERR_OR_NULL(wdev) \ + ? wdev->identifier : 0) #define WDEV_PR_FMT "wdev(%u)" #define WDEV_PR_ARG (__entry->id) @@ -1778,7 +1779,7 @@ TRACE_EVENT(rdev_set_mac_acl, ), TP_fast_assign( WIPHY_ASSIGN; - WIPHY_ASSIGN; + NETDEV_ASSIGN; __entry->acl_policy = params->acl_policy; ), TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", acl policy: %d", |