diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-28 14:40:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-28 14:40:06 -0400 |
| commit | 630a216da662ba4197e330118fc55d772a2d7ec9 (patch) | |
| tree | ddadafda9ba834e74e7f882d761900e08bb1ca1c /net/wireless/trace.h | |
| parent | 91c5746425aed8f7188a351f1224a26aa232e4b3 (diff) | |
| parent | 2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (diff) | |
| download | linux-630a216da662ba4197e330118fc55d772a2d7ec9.tar.gz linux-630a216da662ba4197e330118fc55d772a2d7ec9.tar.bz2 linux-630a216da662ba4197e330118fc55d772a2d7ec9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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", |