diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-19 09:39:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-19 09:39:11 -0500 |
| commit | c6479d6257e093ccbb1ae1ff84901794cbe2d73f (patch) | |
| tree | 9a2fc367eef7e751341cf3b93f006530f5f27f34 /include/net | |
| parent | ab14436065c8066c265540312742390d6d07ddd2 (diff) | |
| parent | 04a7279ff12fc47b657f70731d401c0064f5838a (diff) | |
Merge tag 'mac80211-for-davem-2017-12-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few more fixes:
* hwsim:
- set To-DS bit in some frames missing it
- fix sleeping in atomic
* nl80211:
- doc cleanup
- fix locking in an error path
* build:
- don't append to created certs C files
- ship certificate pre-hexdumped
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 8b8118a7fadb..cb4d92b79cd9 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -3226,7 +3226,6 @@ struct cfg80211_ops { * @WIPHY_FLAG_IBSS_RSN: The device supports IBSS RSN. * @WIPHY_FLAG_MESH_AUTH: The device supports mesh authentication by routing * auth frames to userspace. See @NL80211_MESH_SETUP_USERSPACE_AUTH. - * @WIPHY_FLAG_SUPPORTS_SCHED_SCAN: The device supports scheduled scans. * @WIPHY_FLAG_SUPPORTS_FW_ROAM: The device supports roaming feature in the * firmware. * @WIPHY_FLAG_AP_UAPSD: The device supports uapsd on AP. |