summaryrefslogtreecommitdiffstats
path: root/net/mac80211/trace.h
diff options
context:
space:
mode:
authorAyala Beker <ayala.beker@intel.com>2016-09-20 10:31:19 -0400
committerJohannes Berg <johannes.berg@intel.com>2016-09-30 07:21:43 -0400
commit5953ff6d6a3e92dd4f8d9d8e8a9359d7e180ae93 (patch)
tree4937110ed803a948987fc66bcb3b1d0f88c6fade /net/mac80211/trace.h
parent368e5a7b4ecb71b3d347799cb9351b0dce5dec70 (diff)
mac80211: implement nan_change_conf
Implement nan_change_conf callback which allows to change current NAN configuration (master preference and dual band operation). Store the current NAN configuration in sdata, so it can be used both to provide the driver the updated configuration with changes and also it will be used in hw reconfig flows in next patches. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/trace.h')
-rw-r--r--net/mac80211/trace.h31
1 files changed, 31 insertions, 0 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index deefbfb9f6fb..0bafe1159d01 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -1750,6 +1750,37 @@ TRACE_EVENT(drv_stop_nan,
1750 ) 1750 )
1751); 1751);
1752 1752
1753TRACE_EVENT(drv_nan_change_conf,
1754 TP_PROTO(struct ieee80211_local *local,
1755 struct ieee80211_sub_if_data *sdata,
1756 struct cfg80211_nan_conf *conf,
1757 u32 changes),
1758
1759 TP_ARGS(local, sdata, conf, changes),
1760 TP_STRUCT__entry(
1761 LOCAL_ENTRY
1762 VIF_ENTRY
1763 __field(u8, master_pref)
1764 __field(u8, dual)
1765 __field(u32, changes)
1766 ),
1767
1768 TP_fast_assign(
1769 LOCAL_ASSIGN;
1770 VIF_ASSIGN;
1771 __entry->master_pref = conf->master_pref;
1772 __entry->dual = conf->dual;
1773 __entry->changes = changes;
1774 ),
1775
1776 TP_printk(
1777 LOCAL_PR_FMT VIF_PR_FMT
1778 ", master preference: %u, dual: %d, changes: 0x%x",
1779 LOCAL_PR_ARG, VIF_PR_ARG, __entry->master_pref,
1780 __entry->dual, __entry->changes
1781 )
1782);
1783
1753/* 1784/*
1754 * Tracing for API calls that drivers call. 1785 * Tracing for API calls that drivers call.
1755 */ 1786 */