From patchwork Sat Aug 3 20:16:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1141597 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JayVsxcv"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 461FgK41rMz9s7T for ; Sun, 4 Aug 2019 06:17:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=nXsSlJWUmTaVbwDLIoQMOkVKpYCB5mQUhDt6yAazM8Q=; b=JayVsxcvUMbDMd FL0ZtZxqgbRr5bY7HnM4fyT6XgwCaYe1FARy0YJbA7KHXcw6ObEg/zRIQhcBFj1z2iODjk8gH91st 1VfgY6Ps9MSMwy87he4ic07B6yHds7HebyXWiShz55ACNlKpIOMBcPk4yH5e9nsn5xd3LtT3/6ITs WFfydoGkqvuU8oyBCnhqhLwhJ4/k7C7chF4cPJ0f5xIQnw8i1at3Z++sl6Im8EIgmeYY/Lpadv8eJ ckx1EPauCjHiPZd2frYse6UKQccpm80tuEUUuSDXqeD0q9dNaWFS1ngQiiqLtdfj8cOgKqMafxALD lpvB5QMO6JrcHr8VZFbQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hu0S7-00015f-Uj; Sat, 03 Aug 2019 20:16:31 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hu0S2-000157-Q3 for openwrt-devel@lists.openwrt.org; Sat, 03 Aug 2019 20:16:29 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 808774EB1; Sat, 3 Aug 2019 22:16:21 +0200 (CEST) Received: by meh.true.cz (OpenSMTPD) with ESMTP id a9cb52a2; Sat, 3 Aug 2019 22:16:14 +0200 (CEST) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Sat, 3 Aug 2019 22:16:11 +0200 Message-Id: <20190803201611.21319-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190803_131627_227765_CF0B8C20 X-CRM114-Status: UNSURE ( 6.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH mt76] mt7603: fix build with CONFIG_KERNEL_DYNAMIC_DEBUG=y X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= , Felix Fietkau , Joan Moreau Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When building with CONFIG_KERNEL_DYNAMIC_DEBUG=y enabled, the build fails with following error: :0:37: error: redeclaration of enumerator 'IEEE80211_HW_REPORTS_TX_ACK_STATUS' :0:37: note: in definition of macro 'IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN' In file included from mt76-2019-07-22-75656a45/mt7603/../mt76.h:27:0, from mt76-2019-07-22-75656a45/mt7603/mt7603.h:8, from mt76-2019-07-22-75656a45/mt7603/pci.c:7: usr/include/mac80211/net/mac80211.h:2293:2: note: previous definition of 'IEEE80211_HW_REPORTS_TX_ACK_STATUS' was here IEEE80211_HW_REPORTS_TX_ACK_STATUS, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is caused by failing check-cc-enum build check due to the following compile error: ./include/linux/dynamic_debug.h:77:14: error: 'KBUILD_MODNAME' undeclared (first use in this function); did you mean 'KERN_NODENAME'? .modname = KBUILD_MODNAME, \ So this patch adds missing KBUILD_MODNAME variable to CHECK_CC_ENUM_FLAGS in order to make check-cc-enum build check compile again. Fixes: c4e4982fa923 ("mt7603: set IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN") Cc: Felix Fietkau Reported-by: Joan Moreau Signed-off-by: Petr Štetiar --- mt7603/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/mt7603/Makefile b/mt7603/Makefile index 46e3df56d5ce..29f896a5c3a0 100644 --- a/mt7603/Makefile +++ b/mt7603/Makefile @@ -1,6 +1,7 @@ EXTRA_CFLAGS += -Werror -DCONFIG_MT76_LEDS CHECK_CC_ENUM_FLAGS = $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) +CHECK_CC_ENUM_FLAGS += -DKBUILD_MODNAME='"mt7603e"' check-cc-enum = $(call try-run, echo "int v = $(1);" | $(CC) -Werror $(CHECK_CC_ENUM_FLAGS) $(2) -c -x c - -o "$$TMP",y,n) # backwards compatibility hack