Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp769752pxa; Thu, 27 Aug 2020 15:34:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1kIz/GQU3uzFiavU34vTe1/jGAqMj/smKzIQdM1/Wu7W6bzEtRd2CHTTFobWzH+b1FZES X-Received: by 2002:aa7:dcc6:: with SMTP id w6mr10373526edu.273.1598567668038; Thu, 27 Aug 2020 15:34:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598567668; cv=none; d=google.com; s=arc-20160816; b=X5AbL0xeOCEbuWiBQpSDVAhEv+gk678PZ6qNwGF9FAanBLmY9Z1JF/NvHThYsOOI/o qsVbiNPck887pO+ceaa8pDvJOmjHPpvcs7b4j4R7BX8ehJ3ILA+l/iVAXMRCq+XcnpUD nRhMzQ6W71rLm2rOtuZ6i/me6z4VTsY9beRb4YmUtLbsucol4iGiB5i/YVTGZkPqiOqy 9RKTbtveN4QY17aDKx/w4DAR14H95uw9ObdLoIC86tVKNTXFxt96nPWDu2KZ/M8Z2SU4 LzTs9oB/epKyGmosl6JH/0SCebXK3RhF0TSIIRZe5F9JN81NO+3AKiU+pTxn7xGYAYIa t98A== 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=x3Fl4WcyEohnnFV+i4zkF5QdF/BrBkCLMlgUVVL6nnU=; b=xtng0nlm1xNNworJMqznFuFg8vsUehcfiXuWSzO3IKMmWqhjrp97+pOyIGRpTrIiwg PNMLGaG1Eba8l220rTZAhi4fZK2nFBILWlMZN4f36g+47cqqvqxakmHzxb8nHSmIrziU zY2i6x52Ftkn5V6KigoakbS3yb47/d3hxzwz/w06efLkGttFgptPBCRxjvoUtlGlxNVG 2gCm5rGsNIESWeKbYMvKwybfvaRcqAzfyVM+/VMiZ1qsBuS9zXyNArZuXzDCA325mxHk jb5SOA57TvJF4GkMaG6mbPeHjaotddyWjRs+yJx9cmD+/mPCkk3mrLDe8TSwsPGUlg5b 2IyA== 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 ci25si2498515ejc.643.2020.08.27.15.34.04; Thu, 27 Aug 2020 15:34:28 -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 S1728040AbgH0Wdh (ORCPT + 99 others); Thu, 27 Aug 2020 18:33:37 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:50542 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728035AbgH0Wdf (ORCPT ); Thu, 27 Aug 2020 18:33:35 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id 827264F82E1; Thu, 27 Aug 2020 22:33: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 CnBrsVPI9ekd; Thu, 27 Aug 2020 22:33:32 +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 171674F81D3; Thu, 27 Aug 2020 22:33:12 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH 15/22] mac80211: don't calculate duration for S1G Date: Thu, 27 Aug 2020 15:32:57 -0700 Message-Id: <20200827223304.16155-16-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200827223304.16155-1-thomas@adapt-ip.com> References: <20200827223304.16155-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 dca01d7e6e3e..424fd9b2aeda 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