diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /net/mac80211/trace.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index 9d213e82326e..854bc5943127 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h | |||
| @@ -94,13 +94,13 @@ DECLARE_EVENT_CLASS(local_sdata_addr_evt, | |||
| 94 | TP_STRUCT__entry( | 94 | TP_STRUCT__entry( |
| 95 | LOCAL_ENTRY | 95 | LOCAL_ENTRY |
| 96 | VIF_ENTRY | 96 | VIF_ENTRY |
| 97 | __array(char, addr, 6) | 97 | __array(char, addr, ETH_ALEN) |
| 98 | ), | 98 | ), |
| 99 | 99 | ||
| 100 | TP_fast_assign( | 100 | TP_fast_assign( |
| 101 | LOCAL_ASSIGN; | 101 | LOCAL_ASSIGN; |
| 102 | VIF_ASSIGN; | 102 | VIF_ASSIGN; |
| 103 | memcpy(__entry->addr, sdata->vif.addr, 6); | 103 | memcpy(__entry->addr, sdata->vif.addr, ETH_ALEN); |
| 104 | ), | 104 | ), |
| 105 | 105 | ||
| 106 | TP_printk( | 106 | TP_printk( |