mac80211: support fast-rx with incompatible PS capabilities when PS is disabled

When powersave is disabled for the interface, we can do fast-rx anyway.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
[fixed indentation on one line]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index f4195a0f027989c4829b2f84d678373894d2fa1c..fd68f6fb02d787b1a8b62d13d1b829c355f8f996 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2685,6 +2685,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 
        ieee80211_recalc_ps(local);
        ieee80211_recalc_ps_vif(sdata);
+       ieee80211_check_fast_rx_iface(sdata);
 
        return 0;
 }

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 89dcf9f762ce0fec4c04d34a549b402ac23abb1b..1d417960d3763bca66fff9ba7534a486077d85f0 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3750,12 +3750,7 @@ void ieee80211_check_fast_rx(struct sta_info *sta)
                /* 4-addr is harder to deal with, later maybe */
                if (sdata->u.mgd.use_4addr)
                        goto clear;
-               /* software powersave is a huge mess, avoid all of it */
-               if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK))
-                       goto clear;
-               if (ieee80211_hw_check(&local->hw, SUPPORTS_PS) &&
-                   !ieee80211_hw_check(&local->hw, SUPPORTS_DYNAMIC_PS))
-                       goto clear;
+
                if (sta->sta.tdls) {
                        fastrx.da_offs = offsetof(struct ieee80211_hdr, addr1);
                        fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr2);
@@ -3767,6 +3762,16 @@ void ieee80211_check_fast_rx(struct sta_info *sta)
                        fastrx.expected_ds_bits =
                                cpu_to_le16(IEEE80211_FCTL_FROMDS);
                }
+
+               if (!sdata->u.mgd.powersave)
+                       break;
+
+               /* software powersave is a huge mess, avoid all of it */
+               if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK))
+                       goto clear;
+               if (ieee80211_hw_check(&local->hw, SUPPORTS_PS) &&
+                   !ieee80211_hw_check(&local->hw, SUPPORTS_DYNAMIC_PS))
+                       goto clear;
                break;
        case NL80211_IFTYPE_AP_VLAN:
        case NL80211_IFTYPE_AP: