From patchwork Fri Feb 4 06:24:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Natarajan X-Patchwork-Id: 531151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p146OWM8032173 for ; Fri, 4 Feb 2011 06:24:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752233Ab1BDGYT (ORCPT ); Fri, 4 Feb 2011 01:24:19 -0500 Received: from mail.atheros.com ([12.19.149.2]:57258 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752085Ab1BDGYO (ORCPT ); Fri, 4 Feb 2011 01:24:14 -0500 Received: from mail.atheros.com ([10.10.20.108]) by sidewinder.atheros.com for ; Thu, 03 Feb 2011 22:23:54 -0800 Received: from smtp.atheros.com (10.12.4.8) by SC1EXHC-02.global.atheros.com (10.10.20.106) with Microsoft SMTP Server (TLS) id 8.2.213.0; Thu, 3 Feb 2011 22:24:12 -0800 Received: by smtp.atheros.com (sSMTP sendmail emulation); Fri, 04 Feb 2011 11:54:07 +0530 From: Vivek Natarajan To: CC: Subject: [PATCH 2/2] mac80211: Fix a race on enabling power save. Date: Fri, 4 Feb 2011 11:54:00 +0530 Message-ID: <1296800640-6381-2-git-send-email-vnatarajan@atheros.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1296800640-6381-1-git-send-email-vnatarajan@atheros.com> References: <1296800640-6381-1-git-send-email-vnatarajan@atheros.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Feb 2011 06:24:33 +0000 (UTC) diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 533fd32..6ad97f6 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -346,6 +346,7 @@ enum ieee80211_sta_flags { IEEE80211_STA_UAPSD_ENABLED = BIT(7), IEEE80211_STA_NULLFUNC_ACKED = BIT(8), IEEE80211_STA_RESET_SIGNAL_AVE = BIT(9), + IEEE80211_STA_PS_PENDING = BIT(10), }; struct ieee80211_if_managed { diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index e059b3a..45f736e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -727,13 +727,17 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) return; if ((local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) && - (!(ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED))) + (!(ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED))) { + ifmgd->flags |= IEEE80211_STA_PS_PENDING; ieee80211_send_nullfunc(local, sdata, 1); + } if (!((local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) && (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)) || - (ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED)) { + ((ifmgd->flags & IEEE80211_STA_NULLFUNC_ACKED) && + ifmgd->flags & IEEE80211_STA_PS_PENDING)) { ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED; + ifmgd->flags &= ~IEEE80211_STA_PS_PENDING; local->hw.conf.flags |= IEEE80211_CONF_PS; ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); } diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8fbbc7a..25f576a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1574,6 +1574,7 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct ieee80211_sub_if_data *tmp_sdata; + struct ieee80211_if_managed *ifmgd; int headroom; bool may_encrypt; @@ -1648,6 +1649,11 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, return; } + ifmgd = &sdata->u.mgd; + if (!(ieee80211_is_nullfunc(hdr->frame_control)) && + (ifmgd->flags & IEEE80211_STA_PS_PENDING)) + ifmgd->flags &= ~IEEE80211_STA_PS_PENDING; + ieee80211_set_qos_hdr(local, skb); ieee80211_tx(sdata, skb, false); rcu_read_unlock();