Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 4 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index caa317faee3c..286c7ee35e63 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3856,9 +3856,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,
         }
 
         /* Always allow software iftypes */
-        if (local->hw.wiphy->software_iftypes & BIT(iftype) ||
-            (iftype == NL80211_IFTYPE_AP_VLAN &&
-             local->hw.wiphy->flags & WIPHY_FLAG_4ADDR_AP)) {
+        if (cfg80211_iftype_allowed(local->hw.wiphy, iftype, 0, 1)) {
                 if (radar_detect)
                         return -EINVAL;
                 return 0;
@@ -3893,7 +3891,8 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,
 
                 if (sdata_iter == sdata ||
                     !ieee80211_sdata_running(sdata_iter) ||
-                    local->hw.wiphy->software_iftypes & BIT(wdev_iter->iftype))
+                    cfg80211_iftype_allowed(local->hw.wiphy,
+                                            wdev_iter->iftype, 0, 1))
                         continue;
 
                 params.iftype_num[wdev_iter->iftype]++;