diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-31 18:51:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-31 18:51:34 +0300 |
| commit | f86a677e5752a0250fef0415c40bbe4af37e8653 (patch) | |
| tree | b2d8bdc8fb991528b2bd93e264fd65d3d427b03f /include | |
| parent | fa9586aff919a93761a76feb69718b54d49fdd8e (diff) | |
| parent | eef347f846ee8f7296a6f84e3866c057ca6bcce0 (diff) | |
| download | linux-f86a677e5752a0250fef0415c40bbe4af37e8653.tar.xz | |
Merge tag 'mac80211-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just a few fixes:
* revert NETIF_F_LLTX usage as it caused problems
* avoid warning on WMM parameters from AP that are too short
* fix possible null-ptr dereference in hwsim
* fix interface combinations with 4-addr and crypto control
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 45850a8391d9..26e2ad2c7027 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -7320,6 +7320,21 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev, struct cfg80211_pmsr_request *req, gfp_t gfp); +/** + * cfg80211_iftype_allowed - check whether the interface can be allowed + * @wiphy: the wiphy + * @iftype: interface type + * @is_4addr: use_4addr flag, must be '0' when check_swif is '1' + * @check_swif: check iftype against software interfaces + * + * Check whether the interface is allowed to operate; additionally, this API + * can be used to check iftype against the software interfaces when + * check_swif is '1'. + */ +bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype, + bool is_4addr, u8 check_swif); + + /* Logging, debugging and troubleshooting/diagnostic helpers. */ /* wiphy_printk helpers, similar to dev_printk */ |