| Message ID | 8f0d4a28a35b7efccc80e71101b38c82de20f6ba.1727942154.git-series.nbd@nbd.name (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | wifi: cfg80211/mac80211: improve support for multiple radios | expand |
Hi Felix,
kernel test robot noticed the following build errors:
[auto build test ERROR on 5a4d42c1688c88f3be6aef46b0ea6c32694cd2b8]
url: https://github.com/intel-lab-lkp/linux/commits/Felix-Fietkau/wifi-cfg80211-add-option-for-vif-allowed-radios/20241003-160113
base: 5a4d42c1688c88f3be6aef46b0ea6c32694cd2b8
patch link: https://lore.kernel.org/r/8f0d4a28a35b7efccc80e71101b38c82de20f6ba.1727942154.git-series.nbd%40nbd.name
patch subject: [PATCH v2 06/11] wifi: cfg80211: pass net_device to .set_monitor_channel
config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20241005/202410050156.SGRpd8Up-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241005/202410050156.SGRpd8Up-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202410050156.SGRpd8Up-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from net/wireless/trace.h:13,
from net/wireless/rdev-ops.h:13,
from net/wireless/core.c:32:
net/wireless/trace.h: In function 'trace_rdev_set_monitor_channel':
>> net/wireless/trace.h:1323:24: error: passing argument 3 of '(({...}))' from incompatible pointer type [-Werror=incompatible-pointer-types]
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
| |
| struct cfg80211_chan_def *
include/linux/tracepoint.h:172:61: note: in definition of macro '__DO_TRACE_CALL'
172 | static_call(tp_func_##name)(__data, args); \
| ^~~~
include/linux/tracepoint.h:217:39: note: in expansion of macro 'TP_ARGS'
217 | __DO_TRACE_CALL(name, TP_ARGS(args)); \
| ^~~~~~~
include/linux/tracepoint.h:258:25: note: in expansion of macro '__DO_TRACE'
258 | __DO_TRACE(name, \
| ^~~~~~~~~~
include/linux/tracepoint.h:259:33: note: in expansion of macro 'TP_ARGS'
259 | TP_ARGS(args), \
| ^~~~~~~
include/linux/tracepoint.h:433:9: note: in expansion of macro '__DECLARE_TRACE'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:433:46: note: in expansion of macro 'PARAMS'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~
include/linux/tracepoint.h:567:9: note: in expansion of macro 'DECLARE_TRACE'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
include/linux/tracepoint.h:567:44: note: in expansion of macro 'PARAMS'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~
net/wireless/trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
net/wireless/trace.h:1323:24: note: expected 'struct net_device *' but argument is of type 'struct cfg80211_chan_def *'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
include/linux/tracepoint.h:172:61: note: in definition of macro '__DO_TRACE_CALL'
172 | static_call(tp_func_##name)(__data, args); \
| ^~~~
include/linux/tracepoint.h:217:39: note: in expansion of macro 'TP_ARGS'
217 | __DO_TRACE_CALL(name, TP_ARGS(args)); \
| ^~~~~~~
include/linux/tracepoint.h:258:25: note: in expansion of macro '__DO_TRACE'
258 | __DO_TRACE(name, \
| ^~~~~~~~~~
include/linux/tracepoint.h:259:33: note: in expansion of macro 'TP_ARGS'
259 | TP_ARGS(args), \
| ^~~~~~~
include/linux/tracepoint.h:433:9: note: in expansion of macro '__DECLARE_TRACE'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:433:46: note: in expansion of macro 'PARAMS'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~
include/linux/tracepoint.h:567:9: note: in expansion of macro 'DECLARE_TRACE'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
include/linux/tracepoint.h:567:44: note: in expansion of macro 'PARAMS'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~
net/wireless/trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
In file included from include/linux/kernel.h:34,
from include/linux/uio.h:8,
from include/linux/socket.h:8,
from include/uapi/linux/if.h:25,
from net/wireless/core.c:13:
>> include/linux/static_call_types.h:56:2: error: too few arguments to function '(({...}))'
56 | ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
57 | __STATIC_CALL_ADDRESSABLE(name); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58 | __raw_static_call(name); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
59 | })
| ~~
include/linux/static_call_types.h:90:33: note: in expansion of macro '__static_call'
90 | #define static_call(name) __static_call(name)
| ^~~~~~~~~~~~~
include/linux/tracepoint.h:172:25: note: in expansion of macro 'static_call'
172 | static_call(tp_func_##name)(__data, args); \
| ^~~~~~~~~~~
include/linux/tracepoint.h:217:17: note: in expansion of macro '__DO_TRACE_CALL'
217 | __DO_TRACE_CALL(name, TP_ARGS(args)); \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:258:25: note: in expansion of macro '__DO_TRACE'
258 | __DO_TRACE(name, \
| ^~~~~~~~~~
include/linux/tracepoint.h:433:9: note: in expansion of macro '__DECLARE_TRACE'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:567:9: note: in expansion of macro 'DECLARE_TRACE'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
net/wireless/trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
cc1: some warnings being treated as errors
--
In file included from net/wireless/trace.h:13,
from net/wireless/trace.c:5:
net/wireless/trace.h: In function 'trace_rdev_set_monitor_channel':
>> net/wireless/trace.h:1323:24: error: passing argument 3 of '(({...}))' from incompatible pointer type [-Werror=incompatible-pointer-types]
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
| |
| struct cfg80211_chan_def *
include/linux/tracepoint.h:172:61: note: in definition of macro '__DO_TRACE_CALL'
172 | static_call(tp_func_##name)(__data, args); \
| ^~~~
include/linux/tracepoint.h:217:39: note: in expansion of macro 'TP_ARGS'
217 | __DO_TRACE_CALL(name, TP_ARGS(args)); \
| ^~~~~~~
include/linux/tracepoint.h:258:25: note: in expansion of macro '__DO_TRACE'
258 | __DO_TRACE(name, \
| ^~~~~~~~~~
include/linux/tracepoint.h:259:33: note: in expansion of macro 'TP_ARGS'
259 | TP_ARGS(args), \
| ^~~~~~~
include/linux/tracepoint.h:433:9: note: in expansion of macro '__DECLARE_TRACE'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:433:46: note: in expansion of macro 'PARAMS'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~
include/linux/tracepoint.h:567:9: note: in expansion of macro 'DECLARE_TRACE'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
include/linux/tracepoint.h:567:44: note: in expansion of macro 'PARAMS'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~
net/wireless/trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
net/wireless/trace.h:1323:24: note: expected 'struct net_device *' but argument is of type 'struct cfg80211_chan_def *'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
include/linux/tracepoint.h:172:61: note: in definition of macro '__DO_TRACE_CALL'
172 | static_call(tp_func_##name)(__data, args); \
| ^~~~
include/linux/tracepoint.h:217:39: note: in expansion of macro 'TP_ARGS'
217 | __DO_TRACE_CALL(name, TP_ARGS(args)); \
| ^~~~~~~
include/linux/tracepoint.h:258:25: note: in expansion of macro '__DO_TRACE'
258 | __DO_TRACE(name, \
| ^~~~~~~~~~
include/linux/tracepoint.h:259:33: note: in expansion of macro 'TP_ARGS'
259 | TP_ARGS(args), \
| ^~~~~~~
include/linux/tracepoint.h:433:9: note: in expansion of macro '__DECLARE_TRACE'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:433:46: note: in expansion of macro 'PARAMS'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~
include/linux/tracepoint.h:567:9: note: in expansion of macro 'DECLARE_TRACE'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
include/linux/tracepoint.h:567:44: note: in expansion of macro 'PARAMS'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~
net/wireless/trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
In file included from include/linux/kernel.h:34,
from include/linux/cpumask.h:11,
from arch/x86/include/asm/cpumask.h:5,
from arch/x86/include/asm/msr.h:11,
from arch/x86/include/asm/tsc.h:10,
from arch/x86/include/asm/timex.h:6,
from include/linux/timex.h:67,
from include/linux/time32.h:13,
from include/linux/time.h:60,
from include/linux/stat.h:19,
from include/linux/module.h:13,
from net/wireless/trace.c:1:
>> include/linux/static_call_types.h:56:2: error: too few arguments to function '(({...}))'
56 | ({ \
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
57 | __STATIC_CALL_ADDRESSABLE(name); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58 | __raw_static_call(name); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
59 | })
| ~~
include/linux/static_call_types.h:90:33: note: in expansion of macro '__static_call'
90 | #define static_call(name) __static_call(name)
| ^~~~~~~~~~~~~
include/linux/tracepoint.h:172:25: note: in expansion of macro 'static_call'
172 | static_call(tp_func_##name)(__data, args); \
| ^~~~~~~~~~~
include/linux/tracepoint.h:217:17: note: in expansion of macro '__DO_TRACE_CALL'
217 | __DO_TRACE_CALL(name, TP_ARGS(args)); \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:258:25: note: in expansion of macro '__DO_TRACE'
258 | __DO_TRACE(name, \
| ^~~~~~~~~~
include/linux/tracepoint.h:433:9: note: in expansion of macro '__DECLARE_TRACE'
433 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
| ^~~~~~~~~~~~~~~
include/linux/tracepoint.h:567:9: note: in expansion of macro 'DECLARE_TRACE'
567 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~~
net/wireless/trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h: In function '__traceiter_rdev_set_monitor_channel':
>> net/wireless/./trace.h:1323:24: error: passing argument 3 of '(void (*)(void *, struct wiphy *, struct net_device *, struct cfg80211_chan_def *))it_func' from incompatible pointer type [-Werror=incompatible-pointer-types]
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
| |
| struct cfg80211_chan_def *
include/linux/tracepoint.h:331:77: note: in definition of macro 'DEFINE_TRACE_FN'
331 | ((void(*)(void *, proto))(it_func))(__data, args); \
| ^~~~
include/linux/tracepoint.h:342:58: note: in expansion of macro 'PARAMS'
342 | DEFINE_TRACE_FN(name, NULL, NULL, PARAMS(proto), PARAMS(args));
| ^~~~~~
include/trace/define_trace.h:28:9: note: in expansion of macro 'DEFINE_TRACE'
28 | DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~
include/trace/define_trace.h:28:43: note: in expansion of macro 'PARAMS'
28 | DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
net/wireless/./trace.h:1323:24: note: expected 'struct net_device *' but argument is of type 'struct cfg80211_chan_def *'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
include/linux/tracepoint.h:331:77: note: in definition of macro 'DEFINE_TRACE_FN'
331 | ((void(*)(void *, proto))(it_func))(__data, args); \
| ^~~~
include/linux/tracepoint.h:342:58: note: in expansion of macro 'PARAMS'
342 | DEFINE_TRACE_FN(name, NULL, NULL, PARAMS(proto), PARAMS(args));
| ^~~~~~
include/trace/define_trace.h:28:9: note: in expansion of macro 'DEFINE_TRACE'
28 | DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~
include/trace/define_trace.h:28:43: note: in expansion of macro 'PARAMS'
28 | DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
>> include/linux/tracepoint.h:331:34: error: too few arguments to function '(void (*)(void *, struct wiphy *, struct net_device *, struct cfg80211_chan_def *))it_func'
331 | ((void(*)(void *, proto))(it_func))(__data, args); \
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/tracepoint.h:342:9: note: in expansion of macro 'DEFINE_TRACE_FN'
342 | DEFINE_TRACE_FN(name, NULL, NULL, PARAMS(proto), PARAMS(args));
| ^~~~~~~~~~~~~~~
include/trace/define_trace.h:28:9: note: in expansion of macro 'DEFINE_TRACE'
28 | DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
| ^~~~~~~~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
In file included from include/trace/define_trace.h:102,
from net/wireless/trace.h:4113:
net/wireless/./trace.h: In function 'trace_raw_output_rdev_set_monitor_channel':
>> net/wireless/./trace.h:135:45: error: 'struct trace_event_raw_rdev_set_monitor_channel' has no member named 'center_freq'; did you mean 'center_freq1'?
135 | #define CHAN_PR_ARG __entry->band, __entry->center_freq, __entry->freq_offset
| ^~~~~~~~~~~
include/trace/trace_events.h:203:34: note: in definition of macro 'DECLARE_EVENT_CLASS'
203 | trace_event_printf(iter, print); \
| ^~~~~
include/trace/trace_events.h:45:30: note: in expansion of macro 'PARAMS'
45 | PARAMS(print)); \
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1334:9: note: in expansion of macro 'TP_printk'
1334 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_PR_FMT,
| ^~~~~~~~~
net/wireless/./trace.h:1335:48: note: in expansion of macro 'CHAN_PR_ARG'
1335 | WIPHY_PR_ARG, NETDEV_PR_ARG, CHAN_PR_ARG)
| ^~~~~~~~~~~
net/wireless/./trace.h: In function 'trace_event_raw_event_rdev_set_monitor_channel':
>> net/wireless/./trace.h:1323:24: error: passing argument 3 of 'trace_event_get_offsets_rdev_set_monitor_channel' from incompatible pointer type [-Werror=incompatible-pointer-types]
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
| |
| struct cfg80211_chan_def *
include/trace/trace_events.h:392:71: note: in definition of macro 'DECLARE_EVENT_CLASS'
392 | __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \
| ^~~~
include/trace/trace_events.h:42:30: note: in expansion of macro 'PARAMS'
42 | PARAMS(args), \
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
net/wireless/./trace.h:1321:58: note: expected 'struct net_device *' but argument is of type 'struct cfg80211_chan_def *'
1321 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
| ~~~~~~~~~~~~~~~~~~~^~~~~~
include/trace/trace_events.h:257:65: note: in definition of macro 'DECLARE_EVENT_CLASS'
257 | struct trace_event_data_offsets_##call *__data_offsets, proto) \
| ^~~~~
include/trace/trace_events.h:41:30: note: in expansion of macro 'PARAMS'
41 | PARAMS(proto), \
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1321:9: note: in expansion of macro 'TP_PROTO'
1321 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
| ^~~~~~~~
>> include/trace/trace_events.h:392:23: error: too few arguments to function 'trace_event_get_offsets_rdev_set_monitor_channel'
392 | __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:40:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
include/trace/trace_events.h:256:27: note: declared here
256 | static inline notrace int trace_event_get_offsets_##call( \
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:40:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
In file included from include/trace/define_trace.h:103:
net/wireless/./trace.h: In function 'perf_trace_rdev_set_monitor_channel':
>> net/wireless/./trace.h:1323:24: error: passing argument 3 of 'trace_event_get_offsets_rdev_set_monitor_channel' from incompatible pointer type [-Werror=incompatible-pointer-types]
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
| |
| struct cfg80211_chan_def *
include/trace/perf.h:31:71: note: in definition of macro 'DECLARE_EVENT_CLASS'
31 | __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \
| ^~~~
include/trace/trace_events.h:42:30: note: in expansion of macro 'PARAMS'
42 | PARAMS(args), \
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1323:9: note: in expansion of macro 'TP_ARGS'
1323 | TP_ARGS(wiphy, chandef),
| ^~~~~~~
net/wireless/./trace.h:1321:58: note: expected 'struct net_device *' but argument is of type 'struct cfg80211_chan_def *'
1321 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
| ~~~~~~~~~~~~~~~~~~~^~~~~~
include/trace/trace_events.h:257:65: note: in definition of macro 'DECLARE_EVENT_CLASS'
257 | struct trace_event_data_offsets_##call *__data_offsets, proto) \
| ^~~~~
include/trace/trace_events.h:41:30: note: in expansion of macro 'PARAMS'
41 | PARAMS(proto), \
| ^~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
net/wireless/./trace.h:1321:9: note: in expansion of macro 'TP_PROTO'
1321 | TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
| ^~~~~~~~
>> include/trace/perf.h:31:23: error: too few arguments to function 'trace_event_get_offsets_rdev_set_monitor_channel'
31 | __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:40:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
include/trace/trace_events.h:256:27: note: declared here
256 | static inline notrace int trace_event_get_offsets_##call( \
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:40:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
40 | DECLARE_EVENT_CLASS(name, \
| ^~~~~~~~~~~~~~~~~~~
net/wireless/./trace.h:1320:1: note: in expansion of macro 'TRACE_EVENT'
1320 | TRACE_EVENT(rdev_set_monitor_channel,
| ^~~~~~~~~~~
cc1: some warnings being treated as errors
vim +1323 net/wireless/trace.h
14e8a3c47e8087 Beni Lev 2012-07-31 1319
14e8a3c47e8087 Beni Lev 2012-07-31 1320 TRACE_EVENT(rdev_set_monitor_channel,
ec6ce719e0b1f5 Felix Fietkau 2024-10-03 1321 TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
683b6d3b31a519 Johannes Berg 2012-11-08 1322 struct cfg80211_chan_def *chandef),
683b6d3b31a519 Johannes Berg 2012-11-08 @1323 TP_ARGS(wiphy, chandef),
14e8a3c47e8087 Beni Lev 2012-07-31 1324 TP_STRUCT__entry(
14e8a3c47e8087 Beni Lev 2012-07-31 1325 WIPHY_ENTRY
ec6ce719e0b1f5 Felix Fietkau 2024-10-03 1326 NETDEV_ENTRY
683b6d3b31a519 Johannes Berg 2012-11-08 1327 CHAN_DEF_ENTRY
14e8a3c47e8087 Beni Lev 2012-07-31 1328 ),
14e8a3c47e8087 Beni Lev 2012-07-31 1329 TP_fast_assign(
14e8a3c47e8087 Beni Lev 2012-07-31 1330 WIPHY_ASSIGN;
ec6ce719e0b1f5 Felix Fietkau 2024-10-03 1331 NETDEV_ASSIGN;
683b6d3b31a519 Johannes Berg 2012-11-08 1332 CHAN_DEF_ASSIGN(chandef);
14e8a3c47e8087 Beni Lev 2012-07-31 1333 ),
ec6ce719e0b1f5 Felix Fietkau 2024-10-03 1334 TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_PR_FMT,
ec6ce719e0b1f5 Felix Fietkau 2024-10-03 1335 WIPHY_PR_ARG, NETDEV_PR_ARG, CHAN_PR_ARG)
14e8a3c47e8087 Beni Lev 2012-07-31 1336 );
14e8a3c47e8087 Beni Lev 2012-07-31 1337
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index e8f1d30a8d73..a1a0a9223e74 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -1493,6 +1493,7 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, } static int wil_cfg80211_set_channel(struct wiphy *wiphy, + struct net_device *dev, struct cfg80211_chan_def *chandef) { struct wil6210_priv *wil = wiphy_to_wil(wiphy); diff --git a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c index b700c213d10c..c1f462bb6a3f 100644 --- a/drivers/net/wireless/marvell/libertas/cfg.c +++ b/drivers/net/wireless/marvell/libertas/cfg.c @@ -486,6 +486,7 @@ static int lbs_add_wps_enrollee_tlv(u8 *tlv, const u8 *ie, size_t ie_len) */ static int lbs_cfg_set_monitor_channel(struct wiphy *wiphy, + struct net_device *dev, struct cfg80211_chan_def *chandef) { struct lbs_private *priv = wiphy_priv(wiphy); diff --git a/drivers/net/wireless/microchip/wilc1000/cfg80211.c b/drivers/net/wireless/microchip/wilc1000/cfg80211.c index eb37b228d54e..9977be0020fe 100644 --- a/drivers/net/wireless/microchip/wilc1000/cfg80211.c +++ b/drivers/net/wireless/microchip/wilc1000/cfg80211.c @@ -231,6 +231,7 @@ struct wilc_vif *wilc_get_wl_to_vif(struct wilc *wl) } static int set_channel(struct wiphy *wiphy, + struct net_device *dev, struct cfg80211_chan_def *chandef) { struct wilc *wl = wiphy_priv(wiphy); @@ -1424,7 +1425,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, struct wilc_vif *vif = netdev_priv(dev); int ret; - ret = set_channel(wiphy, &settings->chandef); + ret = set_channel(wiphy, dev, &settings->chandef); if (ret != 0) netdev_err(dev, "Error in setting channel\n"); diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 8bb5fb80cd7b..4dd537da0873 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4696,6 +4696,7 @@ struct cfg80211_ops { struct ieee80211_channel *chan); int (*set_monitor_channel)(struct wiphy *wiphy, + struct net_device *dev, struct cfg80211_chan_def *chandef); int (*scan)(struct wiphy *wiphy, diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 847304a3a29a..b1ea7006f8d3 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -879,6 +879,7 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev, } static int ieee80211_set_monitor_channel(struct wiphy *wiphy, + struct net_device *dev, struct cfg80211_chan_def *chandef) { struct ieee80211_local *local = wiphy_priv(wiphy); diff --git a/net/wireless/chan.c b/net/wireless/chan.c index e579d7e1425f..035f3b099d0f 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -1628,6 +1628,7 @@ bool cfg80211_reg_check_beaconing(struct wiphy *wiphy, EXPORT_SYMBOL(cfg80211_reg_check_beaconing); int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev, + struct net_device *dev, struct cfg80211_chan_def *chandef) { if (!rdev->ops->set_monitor_channel) @@ -1635,7 +1636,7 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev, if (!cfg80211_has_monitors_only(rdev)) return -EBUSY; - return rdev_set_monitor_channel(rdev, chandef); + return rdev_set_monitor_channel(rdev, dev, chandef); } bool cfg80211_any_usable_channels(struct wiphy *wiphy, diff --git a/net/wireless/core.h b/net/wireless/core.h index 3b3e3cd7027a..4c45f994a8c0 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -516,6 +516,7 @@ static inline unsigned int elapsed_jiffies_msecs(unsigned long start) } int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev, + struct net_device *dev, struct cfg80211_chan_def *chandef); int ieee80211_get_ratemask(struct ieee80211_supported_band *sband, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index d2c1fd98dc03..7845548b15b9 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3564,7 +3564,7 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev, case NL80211_IFTYPE_MESH_POINT: return cfg80211_set_mesh_channel(rdev, wdev, &chandef); case NL80211_IFTYPE_MONITOR: - return cfg80211_set_monitor_channel(rdev, &chandef); + return cfg80211_set_monitor_channel(rdev, dev, &chandef); default: break; } diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index f5adbf6b5c84..adb6105bbb7d 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -445,11 +445,12 @@ rdev_libertas_set_mesh_channel(struct cfg80211_registered_device *rdev, static inline int rdev_set_monitor_channel(struct cfg80211_registered_device *rdev, + struct net_device *dev, struct cfg80211_chan_def *chandef) { int ret; - trace_rdev_set_monitor_channel(&rdev->wiphy, chandef); - ret = rdev->ops->set_monitor_channel(&rdev->wiphy, chandef); + trace_rdev_set_monitor_channel(&rdev->wiphy, dev, chandef); + ret = rdev->ops->set_monitor_channel(&rdev->wiphy, dev, chandef); trace_rdev_return_int(&rdev->wiphy, ret); return ret; } diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 97c21b627791..dc217086c155 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -1318,19 +1318,21 @@ TRACE_EVENT(rdev_libertas_set_mesh_channel, ); TRACE_EVENT(rdev_set_monitor_channel, - TP_PROTO(struct wiphy *wiphy, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, struct cfg80211_chan_def *chandef), TP_ARGS(wiphy, chandef), TP_STRUCT__entry( WIPHY_ENTRY + NETDEV_ENTRY CHAN_DEF_ENTRY ), TP_fast_assign( WIPHY_ASSIGN; + NETDEV_ASSIGN; CHAN_DEF_ASSIGN(chandef); ), - TP_printk(WIPHY_PR_FMT ", " CHAN_DEF_PR_FMT, - WIPHY_PR_ARG, CHAN_DEF_PR_ARG) + TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_PR_FMT, + WIPHY_PR_ARG, NETDEV_PR_ARG, CHAN_PR_ARG) ); TRACE_EVENT(rdev_auth, diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 2371069f3c43..fd3d01359807 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -830,7 +830,7 @@ static int cfg80211_wext_siwfreq(struct net_device *dev, ret = -EINVAL; break; } - ret = cfg80211_set_monitor_channel(rdev, &chandef); + ret = cfg80211_set_monitor_channel(rdev, dev, &chandef); break; case NL80211_IFTYPE_MESH_POINT: freq = cfg80211_wext_freq(wextfreq);
Preparation for allowing multiple monitor interfaces with different channels on a multi-radio wiphy. Signed-off-by: Felix Fietkau <nbd@nbd.name> --- drivers/net/wireless/ath/wil6210/cfg80211.c | 1 + drivers/net/wireless/marvell/libertas/cfg.c | 1 + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 3 ++- include/net/cfg80211.h | 1 + net/mac80211/cfg.c | 1 + net/wireless/chan.c | 3 ++- net/wireless/core.h | 1 + net/wireless/nl80211.c | 2 +- net/wireless/rdev-ops.h | 5 +++-- net/wireless/trace.h | 8 +++++--- net/wireless/wext-compat.c | 2 +- 11 files changed, 19 insertions(+), 9 deletions(-)