Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2204166pxb; Tue, 23 Feb 2021 00:45:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUKhtIdLW3vut+E/9XB81zmBh/Q/zUOTWCTgwOsz/9Iipqdo0m5V+uYVPk0kXcUr8oz2Z6 X-Received: by 2002:a05:6402:497:: with SMTP id k23mr26543843edv.315.1614069945011; Tue, 23 Feb 2021 00:45:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614069945; cv=none; d=google.com; s=arc-20160816; b=PJJIpBmGV7JM171moNjXhVv7T0/1cJxEBvUkkFL6UYptWwbZ9Cw2km0c0Dg4pSHvdS gkGaEu8d3gxJNPLvwNtgCdC34N5CbfhnErL3AuCH9k7GK2p/5ojH7xNd0A7X21HMlX4w xxXOvYvlmekRGhKPC0Q9QYuDa93q8P6oQhjU48pGFPdX9jzeW15dE8U9UY6jMPhzcsJr Kc0TJoZj+rBU6wrmHnc055QVXg84kz1N0RXSgfzeqzldtniUa7w29I3ECE8QtC3cn24T eA7tXVTJq9c9tB44Z6xfGVSUoNrrxdZVj7BP67gAYMTDwwSJvvJ3Vq3mJdiIQAYWu1sk lylA== 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=NJhcCIOMMx+AdxVmSOOls34aipsCeKnEI0G+E3IgGwk=; b=BRcw6rchcxNm71GdeWGAXWSy6PGlQ5mvPjLyqEDFWy0/FdKATA3sYPM1bVSFiRsbDv qlh5JPN7XEVyJNJbZJ8U0pNa+07l6J1D0Ex8lBQnSPZJ+ygFm5N15yZeaSsAuet9odrP QG5FM/WprYmBoGRXsQ2WMuLf4NuzZKbB+qaSdi0ISoYzp6sow5RqUf3ingldnss3DUF8 7SEGkbnuVN4zp08hhil26WxAKMtoJhoDeslLuHDRptyRw1Us92CiHrdCizgvgKWAx8aN gODCh5l/SKb0FB1rh54QNR31LL/nzTKW3aawTGpc7A02GggU+5H7HROLO06wXkBix9sD 9HZQ== 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 p1si13203836edr.378.2021.02.23.00.45.17; Tue, 23 Feb 2021 00:45:45 -0800 (PST) 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 S232159AbhBWIoX (ORCPT + 99 others); Tue, 23 Feb 2021 03:44:23 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:40138 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232206AbhBWIoT (ORCPT ); Tue, 23 Feb 2021 03:44:19 -0500 X-UUID: 864402f6301546c78d1de292aae76298-20210223 X-UUID: 864402f6301546c78d1de292aae76298-20210223 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1063770531; Tue, 23 Feb 2021 16:43:35 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 23 Feb 2021 16:43:16 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 23 Feb 2021 16:43:16 +0800 From: Ryder Lee To: Felix Fietkau , Lorenzo Bianconi CC: Shayne Chen , , , Ryder Lee Subject: [PATCH 2/2] mt76: mt7615: remove hdr->fw_ver check Date: Tue, 23 Feb 2021 16:43:12 +0800 Message-ID: X-Mailer: git-send-email 2.18.0 In-Reply-To: <61d40a20375f888c122ee0e186168fc2db863fc3.1614058187.git.ryder.lee@mediatek.com> References: <61d40a20375f888c122ee0e186168fc2db863fc3.1614058187.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 Only mt7615 uses v1 version. Also, some of released firmware doesn't have hdr->fw_ver. Signed-off-by: Ryder Lee --- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 393ce09d3956..65c6ab14fe6f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -1449,8 +1449,7 @@ static int mt7615_load_n9(struct mt7615_dev *dev, const char *name) sizeof(dev->mt76.hw->wiphy->fw_version), "%.10s-%.15s", hdr->fw_ver, hdr->build_date); - if (!is_mt7615(&dev->mt76) && - !strncmp(hdr->fw_ver, "2.0", sizeof(hdr->fw_ver))) { + if (!is_mt7615(&dev->mt76)) { dev->fw_ver = MT7615_FIRMWARE_V2; dev->mcu_ops = &sta_update_ops; } else { -- 2.18.0