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 /net/wireless/core.h | |
| parent | c5006b8aa74599ce19104b31d322d2ea9ff887cc (diff) | |
| parent | 59b179b48ce2a6076448a44531242ac2b3f6cef2 (diff) | |
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 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index d2f7e8b8a097..eaff636169c2 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -507,8 +507,6 @@ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, void cfg80211_stop_nan(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); -#define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10 - #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS #define CFG80211_DEV_WARN_ON(cond) WARN_ON(cond) #else |