diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-01-16 14:28:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-16 14:28:14 -0500 |
| commit | 161f72ed6dbe7fb176585091d3b797125d310399 (patch) | |
| tree | b9721181a9ff22cb14e7ba50b5bccd9bd101c4a8 /include | |
| parent | sctp: do not allow the v4 socket to bind a v4mapped v6 address (diff) | |
| parent | cfg80211: check dev_set_name() return value (diff) | |
| download | linux-dev-161f72ed6dbe7fb176585091d3b797125d310399.tar.xz linux-dev-161f72ed6dbe7fb176585091d3b797125d310399.zip | |
Merge tag 'mac80211-for-davem-2018-01-15' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
More fixes:
* hwsim:
- properly flush deletion works at module unload
- validate # of channels passed from userspace
* cfg80211:
- fix RCU locking regression
- initialize on-stack channel data for nl80211 event
- check dev_set_name() return value
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index cb4d92b79cd9..fb94a8bd8ab5 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -815,6 +815,8 @@ struct cfg80211_csa_settings { u8 count; }; +#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10 + /** * struct iface_combination_params - input parameters for interface combinations * |