Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1306762pxk; Mon, 31 Aug 2020 15:56:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtcYoDSxyK3v6Ki2CBQSUEId0x3Mh5nioi7MQuRHWvAqy2of9J5jyNCh5IFl1Jrb4ZKmRN X-Received: by 2002:a17:906:bc98:: with SMTP id lv24mr1816114ejb.411.1598914572985; Mon, 31 Aug 2020 15:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598914572; cv=none; d=google.com; s=arc-20160816; b=CcBT7Kk84BdCo2Z7nLuG3ZAJdHjTmKtdceKtD6m0RwJDE2M0y+4jwuqzwqQKlTXLfd Qpx3OGEvhrkJBUwJFBqZu9x25djRPdp5rA4/QCc20OcA4PXRk48jtthUaIiEDNPQcN8Z 4KawhnvnyvuEjy8npJLYDanenn82XZvt3wy+dmARFjPh5QwSwApJqD1jWxbtNrD5wV7U ieUROibOZ0DCvoulGvU3ZKd5aAncP1fEXyxwMR2dJh6BQ/UzOyGli7/FQ8ZkQKAooQCW eAD1hr1Aeg959QW/rOE/hAAhkzFVuJ1K8ViG63uLkXdO9gdaeZbW9kBohfvpltYcjRvx ghow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+TpKDyaIH+l8anTc8rl7A6b088m2oa+WIbYj1kajSKA=; b=IcOtBFsYW0ud73ArjTZgY7kGwGFGdyb/SU1gP9+P79I6dINQ182K7W5S2oA/gToTE9 rAKf8GwJAhw7C5xE8ptKsP45RqDIzfdG0Bt6AOjAI+GVDPK8r/Btzu2MaKZRE4U1foee dKlxbhj73j4oWxK8gb7MfCqr7Poa9atB8InERynEhX9bf5H80P6xqMoH4rWLUJpsV1YB +pNpn0O5J1V9V4mpQ2LWHmNszXVpMkx6DjUs0LjQLst5M6jGoCZypMA99vT2U3k0TfSL HK4xAIeRdOkZr41AT3JDA/7J+oDXAC1leN73ZDzTTYgEUiBXRzLJi2XycdCdckBQ/0+y zfMg== 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 sb27si6188281ejb.24.2020.08.31.15.55.49; Mon, 31 Aug 2020 15:56:12 -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 S1730164AbgHaU4k (ORCPT + 99 others); Mon, 31 Aug 2020 16:56:40 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:52356 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728508AbgHaU4h (ORCPT ); Mon, 31 Aug 2020 16:56:37 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id 5BFE64F8AD5; Mon, 31 Aug 2020 20:56:36 +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 q0pzLiqg7Tef; Mon, 31 Aug 2020 20:56:33 +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 EEC784F8E7F; Mon, 31 Aug 2020 20:56:11 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH v2 15/22] mac80211: don't calculate duration for S1G Date: Mon, 31 Aug 2020 13:55:53 -0700 Message-Id: <20200831205600.21058-16-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200831205600.21058-1-thomas@adapt-ip.com> References: <20200831205600.21058-1-thomas@adapt-ip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org 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 d2136007e2eb..bef19616c5f0 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; + /* TODO */ + if (sband->band == NL80211_BAND_S1GHZ) + return 0; + /* * data and mgmt (except PS Poll): * - during CFP: 32768 -- 2.20.1