From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1F5DC4332F for ; Thu, 10 Nov 2022 01:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232181AbiKJBYP convert rfc822-to-8bit (ORCPT ); Wed, 9 Nov 2022 20:24:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229802AbiKJBYP (ORCPT ); Wed, 9 Nov 2022 20:24:15 -0500 Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BF88C186D6; Wed, 9 Nov 2022 17:24:11 -0800 (PST) Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.77 with qID 2AA1MBeW4002649, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/2.81/5.90) with ESMTPS id 2AA1MBeW4002649 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Thu, 10 Nov 2022 09:22:11 +0800 Received: from RTEXDAG01.realtek.com.tw (172.21.6.100) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Thu, 10 Nov 2022 09:22:50 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXDAG01.realtek.com.tw (172.21.6.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Thu, 10 Nov 2022 09:22:49 +0800 Received: from RTEXMBS04.realtek.com.tw ([fe80::15b5:fc4b:72f3:424b]) by RTEXMBS04.realtek.com.tw ([fe80::15b5:fc4b:72f3:424b%5]) with mapi id 15.01.2375.007; Thu, 10 Nov 2022 09:22:49 +0800 From: Ping-Ke Shih To: Wei Li , Kalle Valo , "David S. Miller" , Eric Dumazet , "Jakub Kicinski" , Paolo Abeni CC: "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "huawei.libin@huawei.com" Subject: RE: [PATCH v2] wifi: rtlwifi: Correct header guards of rtl8188ee/rtl8723ae/rtl8192de Thread-Topic: [PATCH v2] wifi: rtlwifi: Correct header guards of rtl8188ee/rtl8723ae/rtl8192de Thread-Index: AQHY9DlHGYaJ/TWn8067GSJWx7N/Fa43XI/A Date: Thu, 10 Nov 2022 01:22:49 +0000 Message-ID: <53fc2d55a61e4ea7a4760e349e6b3f78@realtek.com> References: <20221109124445.3246937-1-liwei391@huawei.com> In-Reply-To: <20221109124445.3246937-1-liwei391@huawei.com> Accept-Language: en-US, zh-TW Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.21.69.188] x-kse-serverinfo: RTEXDAG01.realtek.com.tw, 9 x-kse-attachmentfiltering-interceptor-info: no applicable attachment filtering rules found x-kse-antivirus-interceptor-info: scan successful x-kse-antivirus-info: =?us-ascii?Q?Clean,_bases:_2022/11/9_=3F=3F_11:44:00?= x-kse-bulkmessagesfiltering-scan-result: protection disabled Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org > -----Original Message----- > From: Wei Li > Sent: Wednesday, November 9, 2022 8:45 PM > To: Ping-Ke Shih ; Kalle Valo ; David S. Miller ; > Eric Dumazet ; Jakub Kicinski ; Paolo Abeni > Cc: linux-wireless@vger.kernel.org; netdev@vger.kernel.org; huawei.libin@huawei.com > Subject: [PATCH v2] wifi: rtlwifi: Correct header guards of rtl8188ee/rtl8723ae/rtl8192de > > The header guards of rtl8188ee/rtl8723ae/rtl8192de are promiscuous > currently. Rename them to be consistent with their module names. > > Fixes: f0eb856e0b6c ("rtlwifi: rtl8188ee: Add new driver") > Fixes: c592e631bcec ("rtlwifi: rtl8723ae: Add new driver") > Fixes: 4f01358e5b8a ("rtlwifi: rtl8192de: Merge dynamic management routines") > Signed-off-by: Wei Li > --- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 4 ++-- > drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 4 ++-- > 16 files changed, 32 insertions(+), 32 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h > index edcca42c7464..2f88a6faf535 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92C_DEF_H__ > -#define __RTL92C_DEF_H__ > +#ifndef __RTL88EE_DEF_H__ > +#define __RTL88EE_DEF_H__ > > #define HAL_PRIME_CHNL_OFFSET_DONT_CARE 0 > #define HAL_PRIME_CHNL_OFFSET_LOWER 1 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h > index eb8090caeec2..1573d277a920 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL88E_DM_H__ > -#define __RTL88E_DM_H__ > +#ifndef __RTL88EE_DM_H__ Use a space instead. > +#define __RTL88EE_DM_H__ > > #define MAIN_ANT 0 > #define AUX_ANT 1 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h > index 79f095e47d71..863ddcd98202 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92C__FW__H__ > -#define __RTL92C__FW__H__ > +#ifndef __RTL88EE__FW__H__ > +#define __RTL88EE__FW__H__ > > #define FW_8192C_SIZE 0x8000 > #define FW_8192C_START_ADDRESS 0x1000 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h > index fd09b0712d17..3140b6938ffd 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92CE_HW_H__ > -#define __RTL92CE_HW_H__ > +#ifndef __RTL88EE_HW_H__ > +#define __RTL88EE_HW_H__ > > void rtl88ee_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val); > void rtl88ee_read_eeprom_info(struct ieee80211_hw *hw); > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h > index 67d3dc389ba0..da8a1af3606d 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92CE_LED_H__ > -#define __RTL92CE_LED_H__ > +#ifndef __RTL88EE_LED_H__ > +#define __RTL88EE_LED_H__ > > void rtl88ee_init_sw_leds(struct ieee80211_hw *hw); > void rtl88ee_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h > index 8157ef419eeb..1fa9fd0d472a 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92C_PHY_H__ > -#define __RTL92C_PHY_H__ > +#ifndef __RTL88EE_PHY_H__ > +#define __RTL88EE_PHY_H__ > > /* MAX_TX_COUNT must always set to 4, otherwise read efuse > * table secquence will be wrong. > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h > index 42e222c1795f..e1d6df65c5c4 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL8723E_PWRSEQ_H__ > -#define __RTL8723E_PWRSEQ_H__ > +#ifndef __RTL88EE_PWRSEQ_H__ > +#define __RTL88EE_PWRSEQ_H__ > > #include "../pwrseqcmd.h" > /* Check document WM-20110607-Paul-RTL8188EE_Power_Architecture-R02.vsd > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > index 0fc8db8916fa..6392f2e24ac1 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92C_REG_H__ > -#define __RTL92C_REG_H__ > +#ifndef __RTL88EE_REG_H__ > +#define __RTL88EE_REG_H__ > > #define TXPKT_BUF_SELECT 0x69 > #define RXPKT_BUF_SELECT 0xA5 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h > index 05e27b40b2a9..76cb4cd2b5a2 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92C_RF_H__ > -#define __RTL92C_RF_H__ > +#ifndef __RTL88EE_RF_H__ > +#define __RTL88EE_RF_H__ > > #define RF6052_MAX_TX_PWR 0x3F > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h > index df6065602401..dd4eee147b4c 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92CE_TABLE__H_ > -#define __RTL92CE_TABLE__H_ > +#ifndef __RTL88EE_TABLE__H_ > +#define __RTL88EE_TABLE__H_ > > #include > #define RTL8188EEPHY_REG_1TARRAYLEN 382 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h > index e17f70b4d199..025087026068 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2013 Realtek Corporation.*/ > > -#ifndef __RTL92CE_TRX_H__ > -#define __RTL92CE_TRX_H__ > +#ifndef __RTL88EE_TRX_H__ > +#define __RTL88EE_TRX_H__ > > #define TX_DESC_SIZE 64 > #define TX_DESC_AGGR_SUBFRAME_SIZE 32 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h > index 939cc45bfebd..9cd9070a0281 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2012 Realtek Corporation.*/ > > -#ifndef __RTL92C_DM_H__ > -#define __RTL92C_DM_H__ > +#ifndef __RTL92D_DM_H__ use a space instead. > +#define __RTL92D_DM_H__ > > #define HAL_DM_DIG_DISABLE BIT(0) > #define HAL_DM_HIPWR_DISABLE BIT(1) > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h > index 7599c7e5ecc3..71239a24f2c7 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2012 Realtek Corporation.*/ > > -#ifndef __RTL92CE_LED_H__ > -#define __RTL92CE_LED_H__ > +#ifndef __RTL92DE_LED_H__ > +#define __RTL92DE_LED_H__ > > void rtl92de_init_sw_leds(struct ieee80211_hw *hw); > void rtl92de_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h > index 3f9ed9b4428e..3ab4a7389012 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2012 Realtek Corporation.*/ > > -#ifndef __RTL92C__FW__H__ > -#define __RTL92C__FW__H__ > +#ifndef __RTL8723E__FW__H__ > +#define __RTL8723E__FW__H__ 23AE > > #define FW_8192C_SIZE 0x3000 > #define FW_8192C_START_ADDRESS 0x1000 > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h > index 9f85845d23cd..372f02409dda 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2012 Realtek Corporation.*/ > > -#ifndef __RTL92CE_LED_H__ > -#define __RTL92CE_LED_H__ > +#ifndef __RTL8723E_LED_H__ > +#define __RTL8723E_LED_H__ 23AE > > void rtl8723e_init_sw_leds(struct ieee80211_hw *hw); > void rtl8723e_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled); > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h > b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h > index 98bfe02f66d5..40c89095fd57 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h > @@ -1,8 +1,8 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > /* Copyright(c) 2009-2012 Realtek Corporation.*/ > > -#ifndef __RTL92C_PHY_H__ > -#define __RTL92C_PHY_H__ > +#ifndef __RTL8723E_PHY_H__ > +#define __RTL8723E_PHY_H__ 23AE > > #define MAX_PRECMD_CNT 16 > #define MAX_RFDEPENDCMD_CNT 16 > -- > 2.25.1 > > > ------Please consider the environment before printing this e-mail.