summaryrefslogtreecommitdiffstats
path: root/net/mac80211/trace.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-12-16 11:23:45 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-12-16 11:23:45 +0100
commitc4de673b775e4db48cd2db6277e0c6714332ca0c (patch)
tree84f9e4728e6ccf257236d2ba063b6e784ec8b65d /net/mac80211/trace.h
parentbafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff)
parent55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff)
downloadop-kernel-dev-c4de673b775e4db48cd2db6277e0c6714332ca0c.zip
op-kernel-dev-c4de673b775e4db48cd2db6277e0c6714332ca0c.tar.gz
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/mac80211/trace.h')
-rw-r--r--net/mac80211/trace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 9d213e8..854bc59 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -94,13 +94,13 @@ DECLARE_EVENT_CLASS(local_sdata_addr_evt,
TP_STRUCT__entry(
LOCAL_ENTRY
VIF_ENTRY
- __array(char, addr, 6)
+ __array(char, addr, ETH_ALEN)
),
TP_fast_assign(
LOCAL_ASSIGN;
VIF_ASSIGN;
- memcpy(__entry->addr, sdata->vif.addr, 6);
+ memcpy(__entry->addr, sdata->vif.addr, ETH_ALEN);
),
TP_printk(
OpenPOWER on IntegriCloud