From patchwork Thu Aug 20 18:22:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 42978 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7KIM8pV022444 for ; Thu, 20 Aug 2009 18:22:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755046AbZHTSWE (ORCPT ); Thu, 20 Aug 2009 14:22:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755152AbZHTSWE (ORCPT ); Thu, 20 Aug 2009 14:22:04 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:44251 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755066AbZHTSWD (ORCPT ); Thu, 20 Aug 2009 14:22:03 -0400 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate03.web.de (Postfix) with ESMTP id AB76710E87A75; Thu, 20 Aug 2009 20:22:03 +0200 (CEST) Received: from [91.22.226.122] (helo=debian64.daheim) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1MeCGw-0005wf-00; Thu, 20 Aug 2009 20:22:02 +0200 Received: from debian64.daheim ([192.168.0.4] helo=debian64.localnet ident=chuck) by debian64.daheim with esmtpa (Exim 4.69) (envelope-from ) id 1MeCGw-0007bN-1Q; Thu, 20 Aug 2009 20:22:02 +0200 From: Christian Lamparter To: "linux-wireless" Subject: [PATCH] p54: fix broadcast buffering in AP mode Date: Thu, 20 Aug 2009 20:22:01 +0200 User-Agent: KMail/1.12.0 (Linux/2.6.31-rc6-wl; KDE/4.3.0; x86_64; ; ) Cc: John Linville References: <200908172124.15399.chunkeey@web.de> In-Reply-To: <200908172124.15399.chunkeey@web.de> MIME-Version: 1.0 Message-Id: <200908202022.01623.chunkeey@web.de> X-Sender: chunkeey@web.de X-Provags-ID: V01U2FsdGVkX1/ca88sQlZbMVUhpFD3WuI4PYTntcU1uqmxP1ps 9QebCOMQlRhsQpLYUu093sAjsLUdieHAizZOFKFmcjADwFDUta TdkDIwOL0= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The patch "mac80211: fix PS-poll response race" somehow broke broadcast buffering in a funny way. During normal operation - stations are awake - the firmware refused to transmit broadcast frames and reported P54_TX_PSM_CANCELLED. But everything worked as soon as one station entered PSM. The reason: The stack sets IEEE80211_TX_CTL_SEND_AFTER_DTIM for outgoing broadcast frames as soon as a station is marked as sleeping. This flag triggers a path which will reroute these frames into p54's "content after beacon" queue, which is designed to cope with the demands for psm. This patch restores the old behavior. IEEE80211_TX_CTL_CLEAR_PS_FILT will once again be used to signalize the firmware to ignore the ps canceling for certain frames. Signed-off-by: Christian Lamparter --- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index 6fc0b61..b6dda2b 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -623,6 +623,9 @@ static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb, if (info->flags & IEEE80211_TX_CTL_PSPOLL_RESPONSE) *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL; + if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT) + *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL; + *queue = skb_get_queue_mapping(skb) + P54_QUEUE_DATA; switch (priv->mode) {