diff options
| author | Daniel Wagner <wagi@monom.org> | 2018-04-03 17:10:30 +0200 |
|---|---|---|
| committer | Daniel Wagner <wagi@monom.org> | 2018-04-03 17:10:30 +0200 |
| commit | 723e52ebf702b7dc5904552d09cc4de7cbe70913 (patch) | |
| tree | 7eddce890ca246b352be32dcc0aa5852763acee8 /net/mac80211 | |
| parent | 2f41b395fd2ef30c58f89816b0063159796f4410 (diff) | |
| parent | b766b14a48de577e5060e4d8762f1e4a34229d2b (diff) | |
| download | linux-rt-723e52ebf702b7dc5904552d09cc4de7cbe70913.tar.gz | |
Merge tag 'v4.4.124' into v4.4-rt
This is the 4.4.124 stable release
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 5bad05e9af90..45fb1abdb265 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -194,6 +194,7 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb) } if (ieee80211_is_action(mgmt->frame_control) && + !ieee80211_has_protected(mgmt->frame_control) && mgmt->u.action.category == WLAN_CATEGORY_HT && mgmt->u.action.u.ht_smps.action == WLAN_HT_ACTION_SMPS && ieee80211_sdata_running(sdata)) { |