From nobody Mon Jun 22 22:47:38 2026 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 0E44BC433F5 for ; Tue, 15 Mar 2022 20:51:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351807AbiCOUwQ (ORCPT ); Tue, 15 Mar 2022 16:52:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351695AbiCOUwM (ORCPT ); Tue, 15 Mar 2022 16:52:12 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6948154BF3 for ; Tue, 15 Mar 2022 13:51:00 -0700 (PDT) Received: from ipservice-092-217-079-029.092.217.pools.vodafone-ip.de ([92.217.79.29] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nUE88-00084h-8Z; Tue, 15 Mar 2022 21:50:56 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 1/6] staging: r8188eu: remove unnecessary initializations Date: Tue, 15 Mar 2022 21:50:36 +0100 Message-Id: <20220315205041.2714168-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220315205041.2714168-1-martin@kaiser.cx> References: <20220315205041.2714168-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Do not initialise bPacketMatchBSSID, bPacketToSelf and bPacketBeacon to false at the start of update_recvframe_phyinfo_88e. All of them are set to their actual values before they're used. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index b4c9738ed868..387af789797d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -118,10 +118,6 @@ void update_recvframe_phyinfo_88e(struct recv_frame *p= recvframe, struct phy_stat struct sta_priv *pstapriv; struct sta_info *psta; =20 - pkt_info.bPacketMatchBSSID =3D false; - pkt_info.bPacketToSelf =3D false; - pkt_info.bPacketBeacon =3D false; - pkt_info.bPacketMatchBSSID =3D ((!IsFrameTypeCtrl(wlanhdr)) && !pattrib->icv_err && !pattrib->crc_err && !memcmp(get_hdr_bssid(wlanhdr), --=20 2.30.2 From nobody Mon Jun 22 22:47:38 2026 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 684ABC433F5 for ; Tue, 15 Mar 2022 20:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351816AbiCOUwS (ORCPT ); Tue, 15 Mar 2022 16:52:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351799AbiCOUwM (ORCPT ); Tue, 15 Mar 2022 16:52:12 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BAB354BF9 for ; Tue, 15 Mar 2022 13:51:00 -0700 (PDT) Received: from ipservice-092-217-079-029.092.217.pools.vodafone-ip.de ([92.217.79.29] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nUE89-00084h-6H; Tue, 15 Mar 2022 21:50:57 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 2/6] staging: r8188eu: remove three unused receive defines Date: Tue, 15 Mar 2022 21:50:37 +0100 Message-Id: <20220315205041.2714168-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220315205041.2714168-1-martin@kaiser.cx> References: <20220315205041.2714168-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove three unused defines from rtl8188e_recv.h. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtl8188e_recv.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/stag= ing/r8188eu/include/rtl8188e_recv.h index a2320af11216..09adffd756de 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_recv.h +++ b/drivers/staging/r8188eu/include/rtl8188e_recv.h @@ -6,10 +6,6 @@ =20 #define TX_RPT1_PKT_LEN 8 =20 -#define RECV_BLK_SZ 512 -#define RECV_BLK_CNT 16 -#define RECV_BLK_TH RECV_BLK_CNT - #define NR_PREALLOC_RECV_SKB (8) =20 #define NR_RECVBUFF (4) --=20 2.30.2 From nobody Mon Jun 22 22:47:38 2026 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 50A3DC433F5 for ; Tue, 15 Mar 2022 20:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351826AbiCOUw0 (ORCPT ); Tue, 15 Mar 2022 16:52:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351804AbiCOUwO (ORCPT ); Tue, 15 Mar 2022 16:52:14 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B23954BE8 for ; Tue, 15 Mar 2022 13:51:01 -0700 (PDT) Received: from ipservice-092-217-079-029.092.217.pools.vodafone-ip.de ([92.217.79.29] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nUE8A-00084h-2e; Tue, 15 Mar 2022 21:50:58 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 3/6] staging: r8188eu: remove unused function prototype Date: Tue, 15 Mar 2022 21:50:38 +0100 Message-Id: <20220315205041.2714168-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220315205041.2714168-1-martin@kaiser.cx> References: <20220315205041.2714168-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the prototype for rtl8188eu_recv_hdl. This function does not exist in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtl8188e_recv.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/stag= ing/r8188eu/include/rtl8188e_recv.h index 09adffd756de..8d06815d0374 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_recv.h +++ b/drivers/staging/r8188eu/include/rtl8188e_recv.h @@ -35,7 +35,6 @@ enum rx_packet_type { =20 s32 rtl8188eu_init_recv_priv(struct adapter *padapter); void rtl8188eu_free_recv_priv(struct adapter * padapter); -void rtl8188eu_recv_hdl(struct adapter * padapter, struct recv_buf *precvb= uf); void rtl8188eu_recv_tasklet(unsigned long priv); void rtl8188e_process_phy_info(struct adapter * padapter, void *prframe); void update_recvframe_phyinfo_88e(struct recv_frame *fra, struct phy_stat = *phy); --=20 2.30.2 From nobody Mon Jun 22 22:47:38 2026 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 8FE3DC433EF for ; Tue, 15 Mar 2022 20:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351856AbiCOUwc (ORCPT ); Tue, 15 Mar 2022 16:52:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351815AbiCOUwS (ORCPT ); Tue, 15 Mar 2022 16:52:18 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 123AC54FBC for ; Tue, 15 Mar 2022 13:51:06 -0700 (PDT) Received: from ipservice-092-217-079-029.092.217.pools.vodafone-ip.de ([92.217.79.29] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nUE8B-00084h-0d; Tue, 15 Mar 2022 21:50:59 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 4/6] staging: r8188eu: make rtl8188e_process_phy_info static Date: Tue, 15 Mar 2022 21:50:39 +0100 Message-Id: <20220315205041.2714168-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220315205041.2714168-1-martin@kaiser.cx> References: <20220315205041.2714168-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rtl8188e_process_phy_info is used only in rtl8188e_rxdesc.c. Make the function static and remove its prototype from rtl8188e_recv.h. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- drivers/staging/r8188eu/include/rtl8188e_recv.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index 387af789797d..9bf7a9248026 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -45,7 +45,7 @@ static void process_link_qual(struct adapter *padapter, s= truct recv_frame *prfra signal_stat->avg_val =3D signal_stat->total_val / signal_stat->total_num; } =20 -void rtl8188e_process_phy_info(struct adapter *padapter, void *prframe) +static void rtl8188e_process_phy_info(struct adapter *padapter, void *prfr= ame) { struct recv_frame *precvframe =3D (struct recv_frame *)prframe; =20 diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/stag= ing/r8188eu/include/rtl8188e_recv.h index 8d06815d0374..b752c5c06309 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_recv.h +++ b/drivers/staging/r8188eu/include/rtl8188e_recv.h @@ -36,7 +36,6 @@ enum rx_packet_type { s32 rtl8188eu_init_recv_priv(struct adapter *padapter); void rtl8188eu_free_recv_priv(struct adapter * padapter); void rtl8188eu_recv_tasklet(unsigned long priv); -void rtl8188e_process_phy_info(struct adapter * padapter, void *prframe); void update_recvframe_phyinfo_88e(struct recv_frame *fra, struct phy_stat = *phy); void update_recvframe_attrib_88e(struct recv_frame *fra, struct recv_stat = *stat); =20 --=20 2.30.2 From nobody Mon Jun 22 22:47:38 2026 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 E012AC433FE for ; Tue, 15 Mar 2022 20:51:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351845AbiCOUw1 (ORCPT ); Tue, 15 Mar 2022 16:52:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351808AbiCOUwQ (ORCPT ); Tue, 15 Mar 2022 16:52:16 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5440B54BF9 for ; Tue, 15 Mar 2022 13:51:04 -0700 (PDT) Received: from ipservice-092-217-079-029.092.217.pools.vodafone-ip.de ([92.217.79.29] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nUE8B-00084h-VD; Tue, 15 Mar 2022 21:51:00 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 5/6] staging: r8188eu: remove some unused local ieee80211 macros Date: Tue, 15 Mar 2022 21:50:40 +0100 Message-Id: <20220315205041.2714168-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220315205041.2714168-1-martin@kaiser.cx> References: <20220315205041.2714168-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove some macros from wifi.h which are not used by this driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/wifi.h | 27 -------------------------- 1 file changed, 27 deletions(-) diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188= eu/include/wifi.h index c1c9bae58d6d..c331be19ff83 100644 --- a/drivers/staging/r8188eu/include/wifi.h +++ b/drivers/staging/r8188eu/include/wifi.h @@ -167,17 +167,11 @@ enum WIFI_REG_DOMAIN { =20 #define GetToDs(pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_TO_DS_)) !=3D 0) =20 -#define ClearToDs(pbuf) \ - *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_TO_DS_)) - #define SetFrDs(pbuf) \ *(__le16 *)(pbuf) |=3D cpu_to_le16(_FROM_DS_) =20 #define GetFrDs(pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_FROM_DS_)) !=3D= 0) =20 -#define ClearFrDs(pbuf) \ - *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_FROM_DS_)) - #define get_tofr_ds(pframe) ((GetToDs(pframe) << 1) | GetFrDs(pframe)) =20 #define SetMFrag(pbuf) \ @@ -186,46 +180,25 @@ enum WIFI_REG_DOMAIN { #define ClearMFrag(pbuf) \ *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_MORE_FRAG_)) =20 -#define SetRetry(pbuf) \ - *(__le16 *)(pbuf) |=3D cpu_to_le16(_RETRY_) - #define GetRetry(pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_RETRY_)) !=3D = 0) =20 -#define ClearRetry(pbuf) \ - *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_RETRY_)) - #define SetPwrMgt(pbuf) \ *(__le16 *)(pbuf) |=3D cpu_to_le16(_PWRMGT_) =20 #define GetPwrMgt(pbuf) (((*(__le16 *)(pbuf)) & cpu_to_le16(_PWRMGT_)) != =3D 0) =20 -#define ClearPwrMgt(pbuf) \ - *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_PWRMGT_)) - #define SetMData(pbuf) \ *(__le16 *)(pbuf) |=3D cpu_to_le16(_MORE_DATA_) =20 -#define ClearMData(pbuf) \ - *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_MORE_DATA_)) - #define SetPrivacy(pbuf) \ *(__le16 *)(pbuf) |=3D cpu_to_le16(_PRIVACY_) =20 #define GetPrivacy(pbuf) \ (((*(__le16 *)(pbuf)) & cpu_to_le16(_PRIVACY_)) !=3D 0) =20 -#define ClearPrivacy(pbuf) \ - *(__le16 *)(pbuf) &=3D (~cpu_to_le16(_PRIVACY_)) - #define GetFrameType(pbuf) \ (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(3) | BIT(2))) =20 -#define SetFrameType(pbuf, type) \ - do { \ - *(unsigned short *)(pbuf) &=3D __constant_cpu_to_le16(~(BIT(3) | BIT(2))= ); \ - *(unsigned short *)(pbuf) |=3D __constant_cpu_to_le16(type); \ - } while (0) - #define GetFrameSubType(pbuf) (le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) |\ BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))) =20 --=20 2.30.2 From nobody Mon Jun 22 22:47:38 2026 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 55176C433F5 for ; Tue, 15 Mar 2022 20:51:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351851AbiCOUwa (ORCPT ); Tue, 15 Mar 2022 16:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351813AbiCOUwS (ORCPT ); Tue, 15 Mar 2022 16:52:18 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE6E154F9C for ; Tue, 15 Mar 2022 13:51:05 -0700 (PDT) Received: from ipservice-092-217-079-029.092.217.pools.vodafone-ip.de ([92.217.79.29] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nUE8D-00084h-Lf; Tue, 15 Mar 2022 21:51:01 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 6/6] staging: r8188eu: remove local BIT macro Date: Tue, 15 Mar 2022 21:50:41 +0100 Message-Id: <20220315205041.2714168-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220315205041.2714168-1-martin@kaiser.cx> References: <20220315205041.2714168-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The r8188eu driver defines a local BIT(x) macro. Remove this local macro and use the one from include/linux/bits.h. The global BIT macro returns an unsigned long value. Therefore, we have to cast DYNAMIC_BB_DYNAMIC_TXPWR to u32 explicitly. This define is used with the bitwise not operator. Signed-off-by: Martin Kaiser --- v2: - cast DYNAMIC_BB_DYNAMIC_TXPWR to u32, fix build error on 64-bit systems drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- drivers/staging/r8188eu/include/wifi.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 0c555ea6719b..2b5089be5156 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -34,7 +34,7 @@ /* BB ODM section BIT 0-15 */ #define DYNAMIC_BB_DIG BIT(0) #define DYNAMIC_BB_RA_MASK BIT(1) -#define DYNAMIC_BB_DYNAMIC_TXPWR BIT(2) +#define DYNAMIC_BB_DYNAMIC_TXPWR ((u32)BIT(2)) #define DYNAMIC_BB_BB_FA_CNT BIT(3) =20 #define DYNAMIC_BB_RSSI_MONITOR BIT(4) diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188= eu/include/wifi.h index c331be19ff83..299553351246 100644 --- a/drivers/staging/r8188eu/include/wifi.h +++ b/drivers/staging/r8188eu/include/wifi.h @@ -4,14 +4,9 @@ #ifndef _WIFI_H_ #define _WIFI_H_ =20 +#include #include =20 -#ifdef BIT -/* error "BIT define occurred earlier elsewhere!\n" */ -#undef BIT -#endif -#define BIT(x) (1 << (x)) - #define WLAN_ETHHDR_LEN 14 #define WLAN_HDR_A3_LEN 24 #define WLAN_HDR_A3_QOS_LEN 26 --=20 2.30.2