Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3676458pxk; Mon, 21 Sep 2020 22:41:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZ4v9NrV3V4PrFI86NZePdCcrq9hyGDqwY400KgKUrfJhoBbB4ix0lOv5wlMqyzLJNwdgn X-Received: by 2002:a50:ce4e:: with SMTP id k14mr2189704edj.177.1600753277431; Mon, 21 Sep 2020 22:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600753277; cv=none; d=google.com; s=arc-20160816; b=eh61N3WWLBgNO6zCTXHlnwj+wLYCBr5MzP1NKMm05fUu9s1nWyBBjYjlfgm11qL87p jBVIvJoJrX2m3JRaCp+xagZk/0RBmxgqzDVYQiDUeFougfAtGHcMTBMoA7dvHES1m/cJ /6n3YoBbTJLsDygTpoNr7XRenHnFiGKoJCKo/y/9ZRnH5bN7wWuKlChvlmogE7v9351S POoY9g0TJ0z5xs7xuGJLYk0h+2rXdeP9PF90c6+xBf2HjcrIXwOOsTlLmf8acLid7Ddz d8ItvLdkEwQ8WbtC+H+u16rlLRJRZCBjEleuZBy4sj2KKES2aFD4CZM0aaDPFGtbZhQA 3Z1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=iuBHd0zolr5l3hcfdVwT7BAyhIfPPQ8FTm/imnuKAtk=; b=tZWsCawH1Wh9iI0VDTzxEOOMhWwIiJ7iinggQqIBQBvw9UD2R/oToXz4VAoGwbfIJZ P30TVhXKFicINLGWsIemDHCCRvS9caE3i/XIl4xyS9NO0yoWDM62NkOK2B2iKVJQYJjG kA2yEk8YOUZ6BF9ySPLV4bYffl5OAt222jeyhP5EiOwWmahMHYpjZjvjbLwSjkQcNyZU Riji5M91ppc7MITv5ER7CWy7pwVXLbYOMjb5KbuV8/NQ2eUH0cshlIhveRueMJVDl7X3 srtcmwRvjMsHe3iBi0CX7jvnBZ8zBLji0O2TmusD6j8sJWgmXEWVPsdKUYTpp94yLMdh cPNw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v5si10051649edx.502.2020.09.21.22.40.53; Mon, 21 Sep 2020 22:41:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728918AbgIVFhf (ORCPT + 99 others); Tue, 22 Sep 2020 01:37:35 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:34072 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728898AbgIVFhe (ORCPT ); Tue, 22 Sep 2020 01:37:34 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id 254AC4F9DFF; Tue, 22 Sep 2020 05:37:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at web.adapt-ip.com Received: from web.adapt-ip.com ([127.0.0.1]) by localhost (web.adapt-ip.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sb7T494zj5k0; Tue, 22 Sep 2020 05:37:31 +0000 (UTC) Received: from atlas.campbell.adapt-ip.com (gateway.adapt-ip.com [173.164.178.20]) (Authenticated sender: thomas@adapt-ip.com) by web.adapt-ip.com (Postfix) with ESMTPSA id 7CEBB4F9E01; Tue, 22 Sep 2020 05:37:19 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH v4 10/17] mac80211: don't calculate duration for S1G Date: Mon, 21 Sep 2020 19:28:11 -0700 Message-Id: <20200922022818.15855-11-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200922022818.15855-1-thomas@adapt-ip.com> References: <20200922022818.15855-1-thomas@adapt-ip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org For now just skip the duration calculation for frames transmitted on the S1G band and avoid a warning. Signed-off-by: Thomas Pedersen --- net/mac80211/tx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index adc83d830691..713b432e3d8b 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -82,6 +82,10 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, erp = txrate->flags & IEEE80211_RATE_ERP_G; + /* device is expected to do this */ + if (sband->band == NL80211_BAND_S1GHZ) + return 0; + /* * data and mgmt (except PS Poll): * - during CFP: 32768 -- 2.20.1