[RFC 07/07] mac80211: Do not call release_buffered_frames if not available.

[RFC 07/07] mac80211: Do not call release_buffered_frames if not available.

[Dmitry Tarnyagin]

From: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
Date: Wed, 5 Oct 2011 13:20:04 +0200

A new .release_buffered_frames callback was introduced recently.
Check for the callback presence was missing in the mac80211 code,
and PM state could get broken in some cases.

Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
---
  net/mac80211/sta_info.c |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 58b1c2b..ff30fe3 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1262,7 +1262,9 @@ ieee80211_sta_ps_deliver_response(struct sta_info  
*sta,
  		tids = ieee80211_tids_for_ac(ac);

  		if (!found) {
-			driver_release_tids = sta->driver_buffered_tids & tids;
+			if (local->ops->release_buffered_frames)
+				driver_release_tids =
+					sta->driver_buffered_tids & tids;
  			if (driver_release_tids) {
  				found = true;
  			} else {
-- 
1.7.1

Re: [RFC 07/07] mac80211: Do not call release_buffered_frames if not available.

[Johannes Berg]

On Wed, 2011-10-12 at 03:02 +0200, Dmitry Tarnyagin wrote:
> From: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>
> Date: Wed, 5 Oct 2011 13:20:04 +0200
> 
> A new .release_buffered_frames callback was introduced recently.
> Check for the callback presence was missing in the mac80211 code,
> and PM state could get broken in some cases.

Interesting, but we do check:

drv_release_buffered_frames(struct ieee80211_local *local,
                            struct sta_info *sta, u16 tids, int num_frames,
                            enum ieee80211_frame_release_type reason,
                            bool more_data)
{
        trace_drv_release_buffered_frames(local, &sta->sta, tids, num_frames,
                                          reason, more_data);
        if (local->ops->release_buffered_frames)
                local->ops->release_buffered_frames(&local->hw, &sta->sta, tids,


So whatever you're trying to do must be something else.

johannes