From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 323D4C282CE for ; Mon, 11 Feb 2019 14:54:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03FFD20700 for ; Mon, 11 Feb 2019 14:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896895; bh=aV6mMMVY8yZQWlUQi1qjtTffDxPNTus7q+HHg3BYZIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lNO1AzBLOz4lke7FWsOoWEYangb5rZy+iOobVNEibZiNXd3APZpudkKMxGwQzSY/4 XDOKjHX88bGRsDK5iE0CiXMuaiNcpuiDhGRW4vZArblrsY1G91koXgt5LJZewpJL1p i7dJLaGwNz3YTbvpWswLSAPn85+IMrX8WWiCRhrc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388701AbfBKOyy (ORCPT ); Mon, 11 Feb 2019 09:54:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:41698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388488AbfBKOyt (ORCPT ); Mon, 11 Feb 2019 09:54:49 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A3994222AE; Mon, 11 Feb 2019 14:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896889; bh=aV6mMMVY8yZQWlUQi1qjtTffDxPNTus7q+HHg3BYZIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IGXXjeeTSeRYxvy1abRN+puexKGDRwYHZ7WZlo6GfbTjndu3twkrCALZBhsd4xE4W GgUG+hxqXMpLl+cCmdD8GHcp4gYGvZSYVNyLQbocdCekYTFA40djqvg1VE92qfOwEP gh6xYetSOSm3VsD6cFlCSGGufiqzfmJ8wuPTtnB0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Koen Vandeputte , Lorenzo Bianconi , Kalle Valo , Sasha Levin Subject: [PATCH 4.14 007/205] ath9k: dynack: use authentication messages for late ack Date: Mon, 11 Feb 2019 15:16:45 +0100 Message-Id: <20190211141827.640823098@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ] In order to properly support dynack in ad-hoc mode running wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km link Reported-by: Koen Vandeputte Tested-by: Koen Vandeputte Signed-off-by: Lorenzo Bianconi Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/dynack.c b/drivers/net/wireless/ath/ath9k/dynack.c index 7334c9b09e82..cc0dc966c512 100644 --- a/drivers/net/wireless/ath/ath9k/dynack.c +++ b/drivers/net/wireless/ath/ath9k/dynack.c @@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, /* late ACK */ if (ts->ts_status & ATH9K_TXERR_XRETRY) { if (ieee80211_is_assoc_req(hdr->frame_control) || - ieee80211_is_assoc_resp(hdr->frame_control)) { + ieee80211_is_assoc_resp(hdr->frame_control) || + ieee80211_is_auth(hdr->frame_control)) { ath_dbg(common, DYNACK, "late ack\n"); ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2); ath9k_hw_set_ack_timeout(ah, LATEACK_TO); -- 2.19.1