diff options
author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
commit | c5833b96030f9e06cf7c19dd4f99d3b55985eb8c (patch) | |
tree | 9587bb407acebb17bbd8a33d2d9c53ecbe1ab442 /net/mac80211/status.c | |
parent | 78c39820dc30c73f5b69c3fe2269ad9b0840a61a (diff) | |
parent | b766b14a48de577e5060e4d8762f1e4a34229d2b (diff) |
Merge tag 'v4.4.124' into linux-linaro-lsk-v4.4lsk-v4.4-18.03
This is the 4.4.124 stable release
Diffstat (limited to 'net/mac80211/status.c')
-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)) { |