1 files changed, 8 insertions, 5 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index cba4633cd6cf..1b224fa27367 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2002-2005, Instant802 Networks, Inc.
  * Copyright 2005-2006, Devicescape Software, Inc.
@@ -7,10 +8,6 @@
  * Copyright (C) 2015-2017      Intel Deutschland GmbH
  * Copyright (C) 2018-2019 Intel Corporation
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * utilities for mac80211
  */
 
@@ -2480,6 +2477,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 mutex_lock(&local->mtx);
                 ieee80211_start_next_roc(local);
                 mutex_unlock(&local->mtx);
+
+                /* Requeue all works */
+                list_for_each_entry(sdata, &local->interfaces, list)
+                        ieee80211_queue_work(&local->hw, &sdata->work);
         }
 
         ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,
@@ -3795,7 +3796,9 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,
         }
 
         /* Always allow software iftypes */
-        if (local->hw.wiphy->software_iftypes & BIT(iftype)) {
+        if (local->hw.wiphy->software_iftypes & BIT(iftype) ||
+            (iftype == NL80211_IFTYPE_AP_VLAN &&
+             local->hw.wiphy->flags & WIPHY_FLAG_4ADDR_AP)) {
                 if (radar_detect)
                         return -EINVAL;
                 return 0;