From patchwork Mon Jan 19 13:12:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5658701 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4AEDF9F358 for ; Mon, 19 Jan 2015 13:20:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72DD820383 for ; Mon, 19 Jan 2015 13:20:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 087BF20382 for ; Mon, 19 Jan 2015 13:20:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDCFL-0006kw-A1; Mon, 19 Jan 2015 13:19:59 +0000 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDC9X-0001zD-IY for ath10k@lists.infradead.org; Mon, 19 Jan 2015 13:14:02 +0000 Received: by mail-wg0-f46.google.com with SMTP id x13so31669568wgg.5 for ; Mon, 19 Jan 2015 05:13:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=GCQyYDkJ587C7/lCoFCpWXzrBRu6tfKxTIxhOSNnEYE=; b=j3+jv/EMbhuzvlWl3KW4fRsOu7OklVQ0lMIKvfswljAeP8cIZbqoIh534ArdCJjtGT 6eOgWgljyKe7ywsqLVyfNPMBqAXrZkIc0m/rcEizA9NAKzP36tRD7C3/AdRfPyhmYNy5 Tm8ZqLW2tjfdkZrgwN35Vb6q/18Kro7lKo1Uw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GCQyYDkJ587C7/lCoFCpWXzrBRu6tfKxTIxhOSNnEYE=; b=iv95PJFHgfH4H3z6ecViOstL0FuyLpsKH/bgldrrnWbotz8zhaSO+Q+TB3aASx5k/i BU6Z+3P5XgbxkhXaDF6HLZQyFjfGP4D1efmhefoRXBoph1i7jQ+FmpMwaZHLdDHsvvBh bHnmwCQt1+jjvazmyc9uC6WvwRVWKVQuPOSbOhN6mbDPz2pCgIla17WOWVwAUrtTlzHG h96EBGuzdA3HlTzHSXd90ShXkhIRdlWYddfRt6+4SmhxK61Snyrl7Becrk/B5h0OKQmj CyrscdyeAHraft6thiw0Pp8CyiOg9Qt2/fH7clwdHVRHv6SzG+BDKUgikErZqhR6LYMH yl2A== X-Gm-Message-State: ALoCoQkW8Wmkp29XG4NMSUJ9TR9IqJ17v9OJo7gn0xJdy1qoUe5/J/RA/zO5tJrV4MQQIpHF+sxa0CNvqWW6p55WKG2sVEQ1nI3ZuzxYiljdpu5KFxhONiRkJdAytK9bb49YP3HbXchvDnPt89WiItZ6gItzd6w88iCCdJhJYo8GCn6TfSUyaVQ= X-Received: by 10.194.110.69 with SMTP id hy5mr60373101wjb.121.1421673213622; Mon, 19 Jan 2015 05:13:33 -0800 (PST) Received: from bob.homerouter.cpe (apn-46-76-65-212.dynamic.gprs.plus.pl. [46.76.65.212]) by mx.google.com with ESMTPSA id qg11sm14145721wic.17.2015.01.19.05.13.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jan 2015 05:13:33 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH] ath10k: fix nullfunc workaround Date: Mon, 19 Jan 2015 14:12:57 +0100 Message-Id: <1421673177-2245-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150119_051359_792741_41289AB9 X-CRM114-Status: UNSURE ( 8.30 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The workaround couldn't work correctly because the 802.11 header wasn't properly stripped of QoS Data bit so it wasn't recognized in the later parts of tx path as NullFunc frame and ended up in HTT Tx instead of HTT Mgmt Tx. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 9524bc5..82c567d 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2145,6 +2145,7 @@ static void ath10k_tx_h_nwifi(struct ieee80211_hw *hw, struct sk_buff *skb) * used only for CQM purposes (e.g. hostapd station keepalive ping) so * it is safe to downgrade to NullFunc. */ + hdr = (void *)skb->data; if (ieee80211_is_qos_nullfunc(hdr->frame_control)) { hdr->frame_control &= ~__cpu_to_le16(IEEE80211_STYPE_QOS_DATA); cb->htt.tid = HTT_DATA_TX_EXT_TID_NON_QOS_MCAST_BCAST;