Merge remote-tracking branch 'wireless-next/master' into mac80211-next

This commit is contained in:
Johannes Berg
2013-12-16 11:23:45 +01:00
9115 changed files with 357063 additions and 191659 deletions

View File

@@ -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(