1 files changed, 3 insertions, 5 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 51cb8bc3af81..c06496f0b76d 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -789,7 +789,7 @@ static void ap_sta_ps_start(struct sta_info *sta)
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 }
 
-static int ap_sta_ps_end(struct sta_info *sta)
+static void ap_sta_ps_end(struct sta_info *sta)
 {
         struct ieee80211_sub_if_data *sdata = sta->sdata;
         struct ieee80211_local *local = sdata->local;
@@ -819,8 +819,6 @@ static int ap_sta_ps_end(struct sta_info *sta)
                "since STA not sleeping anymore\n", sdata->dev->name,
                sta->sta.addr, sta->sta.aid, sent - buffered, buffered);
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
-
-        return sent;
 }
 
 static ieee80211_rx_result debug_noinline
@@ -879,7 +877,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
                          */
                         if (ieee80211_is_data(hdr->frame_control) &&
                             !ieee80211_has_pm(hdr->frame_control))
-                                rx->sent_ps_buffered += ap_sta_ps_end(sta);
+                                ap_sta_ps_end(sta);
                 } else {
                         if (ieee80211_has_pm(hdr->frame_control))
                                 ap_sta_ps_start(sta);
@@ -1147,7 +1145,7 @@ ieee80211_rx_h_ps_poll(struct ieee80211_rx_data *rx)
                 if (no_pending_pkts)
                         sta_info_clear_tim_bit(rx->sta);
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        } else if (!rx->sent_ps_buffered) {
+        } else {
                 /*
                  * FIXME: This can be the result of a race condition between
                  *        us expiring a frame and the station polling for it.