History

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 ====================

David S. Miller committed 7 years ago

Commit f86a6772 parents fa9586a eef347f8 files · +61 −17Browse files

Showing the changes to include/net (1 of 8 files). Show all

Unified · Split

include/net/cfg80211.h+15−0
@@ -7320,6 +7320,21 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev, · 7319 unmodified lines
73207320 struct cfg80211_pmsr_request *req,
73217321 gfp_t gfp);
73227322
7323+/**
7324+ * cfg80211_iftype_allowed - check whether the interface can be allowed
7325+ * @wiphy: the wiphy
7326+ * @iftype: interface type
7327+ * @is_4addr: use_4addr flag, must be '0' when check_swif is '1'
7328+ * @check_swif: check iftype against software interfaces
7329+ *
7330+ * Check whether the interface is allowed to operate; additionally, this API
7331+ * can be used to check iftype against the software interfaces when
7332+ * check_swif is '1'.
7333+ */
7334+bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,
7335+ bool is_4addr, u8 check_swif);
7336+
7337+
73237338 /* Logging, debugging and troubleshooting/diagnostic helpers. */
73247339
73257340 /* wiphy_printk helpers, similar to dev_printk */