Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp776092pxj; Thu, 17 Jun 2021 13:40:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7xVSjfHBYLFri20mNX3xbiA3RIx2we0yoeczhrSE5FvDYqLW56BF9ydav4LkipMwmtHee X-Received: by 2002:a05:6402:30a8:: with SMTP id df8mr207938edb.7.1623962400628; Thu, 17 Jun 2021 13:40:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623962400; cv=none; d=google.com; s=arc-20160816; b=BNHP/3D9QmDJ0RGu4RE2qiqUpSfE5Na+hjIhAxgQojApJ7AVA1Ab8NUSFaM4pBo4Dw oPwYt3WiJh3HQ4qsqw0/aM7OmNqU36NJwMfhkglxygUkd9XtaDuyaca5haLZGyDLHGvL rwPh6oZ5PfnwuUL4hHzcf8W/cbnXeKaCwlqIcj8WQSsmP/lEY6UYg8Gn+Q23mTjvd6c9 XgurQMpLYN141yAFxCtGsc/gxYpxjKSknTrYd6W3cNI2SpM+htI4plYJGXG/HtJh8wBN 3ryXGlgnffTSb4YzRyaS9/OLugoTBsTQvOm6uY+7B70N8HpMHxNybB0IoTM2eyHBtBhi DysQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=FuR9Ap/avpgIf2o5TZrmTQp7mv7sVnfMbvR1ThjHNrs=; b=N4AscOL4+r8sQGkmhp4G/GBrg4L09s1Mnt57U7qMM4j5N3EfIcK2ATzq/EKVzAkmw4 2rbKpVi55YvsU+YyZYXfvZFI6y3mxScJJV2DeDdfAAKs0PVkLtjRjGq8wG142N6Uppfc 4ZHTWbyM98EhM3UHkP3qpNIM+KhL5BCniUmvf18PHGqUcH/6kXpL7LBNw5pSCzm+UW3a iLa0eY8asl9mwxGRh0ybn4SFCgMjBoOPUTl/wYTL7amSnVYU5ybIKqIctkffbl+IehLY Si2AWk/p5sThVh8PGT/yVnVyHckBxaqGJkWPNC8VzqeMLnOW6KsXAg+MNbcT2NvkIlFL PVxg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 8si94865ejb.113.2021.06.17.13.39.15; Thu, 17 Jun 2021 13:40:00 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232154AbhFQSzW (ORCPT + 99 others); Thu, 17 Jun 2021 14:55:22 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:43622 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232093AbhFQSzV (ORCPT ); Thu, 17 Jun 2021 14:55:21 -0400 X-UUID: 18f7ec35c784444f81a042d9476d6765-20210618 X-UUID: 18f7ec35c784444f81a042d9476d6765-20210618 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 491966494; Fri, 18 Jun 2021 02:53:08 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 18 Jun 2021 02:53:07 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 18 Jun 2021 02:53:07 +0800 From: Ryder Lee To: Felix Fietkau CC: Lorenzo Bianconi , Shayne Chen , Evelyn Tsai , , , Ryder Lee Subject: [PATCH 2/4] mt76: drop MT_DRV_AMSDU_OFFLOAD flag Date: Fri, 18 Jun 2021 02:53:03 +0800 Message-ID: <8123b01f059783c5a67f09563ba7bc107e3e2689.1623955182.git.ryder.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <4718d8041f908cb3249ec68c59a6854919f00752.1623955182.git.ryder.lee@mediatek.com> References: <4718d8041f908cb3249ec68c59a6854919f00752.1623955182.git.ryder.lee@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org It's not needed after introducing IEEE80211_OFFLOAD_ENCAP_ENABLED in mac80211. Signed-off-by: Ryder Lee --- drivers/net/wireless/mediatek/mt76/mac80211.c | 8 ++------ drivers/net/wireless/mediatek/mt76/mt76.h | 1 - drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index ebd59d7e5837..89d09187655b 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -322,12 +322,8 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw) ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS); ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU); ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER); - - if (!(dev->drv->drv_flags & MT_DRV_AMSDU_OFFLOAD)) { - ieee80211_hw_set(hw, TX_AMSDU); - ieee80211_hw_set(hw, TX_FRAG_LIST); - } - + ieee80211_hw_set(hw, TX_AMSDU); + ieee80211_hw_set(hw, TX_FRAG_LIST); ieee80211_hw_set(hw, MFP_CAPABLE); ieee80211_hw_set(hw, AP_LINK_PS); ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS); diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index c7085d6cdcc4..6ee29b684f24 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -343,7 +343,6 @@ struct mt76_hw_cap { #define MT_DRV_SW_RX_AIRTIME BIT(2) #define MT_DRV_RX_DMA_HDR BIT(3) #define MT_DRV_HW_MGMT_TXQ BIT(4) -#define MT_DRV_AMSDU_OFFLOAD BIT(5) struct mt76_driver_ops { u32 drv_flags; diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c index 340b364da5f0..e5a3f0ddaec3 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c @@ -222,8 +222,7 @@ static int mt7915_pci_probe(struct pci_dev *pdev, static const struct mt76_driver_ops drv_ops = { /* txwi_size = txd size + txp size */ .txwi_size = MT_TXD_SIZE + sizeof(struct mt7915_txp), - .drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ | - MT_DRV_AMSDU_OFFLOAD, + .drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ, .survey_flags = SURVEY_INFO_TIME_TX | SURVEY_INFO_TIME_RX | SURVEY_INFO_TIME_BSS_RX, diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c index 13263f50dc00..0aed1d061316 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -94,8 +94,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, static const struct mt76_driver_ops drv_ops = { /* txwi_size = txd size + txp size */ .txwi_size = MT_TXD_SIZE + sizeof(struct mt7921_txp_common), - .drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ | - MT_DRV_AMSDU_OFFLOAD, + .drv_flags = MT_DRV_TXWI_NO_FREE | MT_DRV_HW_MGMT_TXQ, .survey_flags = SURVEY_INFO_TIME_TX | SURVEY_INFO_TIME_RX | SURVEY_INFO_TIME_BSS_RX, -- 2.18.0