Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux-2.6-microblaze.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index c127deb..7032a2b 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -808,7 +808,8 @@ static bool ieee80211_set_sdata_offload_flags(struct ieee80211_sub_if_data *sdat
            ieee80211_iftype_supports_hdr_offload(sdata->vif.type)) {
                flags |= IEEE80211_OFFLOAD_DECAP_ENABLED;
 
-               if (local->monitors)
+               if (local->monitors &&
+                   !ieee80211_hw_check(&local->hw, SUPPORTS_CONC_MON_RX_DECAP))
                        flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED;
        } else {
                flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED;