diff options
Diffstat (limited to 'net/mac80211/status.c')
-rw-r--r-- | net/mac80211/status.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index c6d5c724e032..a2a68269675d 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c | |||
@@ -771,6 +771,13 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
771 | clear_sta_flag(sta, WLAN_STA_SP); | 771 | clear_sta_flag(sta, WLAN_STA_SP); |
772 | 772 | ||
773 | acked = !!(info->flags & IEEE80211_TX_STAT_ACK); | 773 | acked = !!(info->flags & IEEE80211_TX_STAT_ACK); |
774 | |||
775 | /* mesh Peer Service Period support */ | ||
776 | if (ieee80211_vif_is_mesh(&sta->sdata->vif) && | ||
777 | ieee80211_is_data_qos(fc)) | ||
778 | ieee80211_mpsp_trigger_process( | ||
779 | ieee80211_get_qos_ctl(hdr), sta, true, acked); | ||
780 | |||
774 | if (!acked && test_sta_flag(sta, WLAN_STA_PS_STA)) { | 781 | if (!acked && test_sta_flag(sta, WLAN_STA_PS_STA)) { |
775 | /* | 782 | /* |
776 | * The STA is in power save mode, so assume | 783 | * The STA is in power save mode, so assume |
@@ -781,13 +788,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
781 | return; | 788 | return; |
782 | } | 789 | } |
783 | 790 | ||
784 | /* mesh Peer Service Period support */ | ||
785 | if (ieee80211_vif_is_mesh(&sta->sdata->vif) && | ||
786 | ieee80211_is_data_qos(fc)) | ||
787 | ieee80211_mpsp_trigger_process( | ||
788 | ieee80211_get_qos_ctl(hdr), | ||
789 | sta, true, acked); | ||
790 | |||
791 | if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL) && | 791 | if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL) && |
792 | (ieee80211_is_data(hdr->frame_control)) && | 792 | (ieee80211_is_data(hdr->frame_control)) && |
793 | (rates_idx != -1)) | 793 | (rates_idx != -1)) |