From: Luka Gejak <lukagejak5@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dan Carpenter <dan.carpenter@linaro.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Luka Gejak <lukagejak5@gmail.com>
Subject: [PATCH v1 3/5] staging: rtl8723bs: remove NDIS type aliases
Date: Mon, 2 Feb 2026 08:07:50 +0100 [thread overview]
Message-ID: <20260202070752.3391-4-lukagejak5@gmail.com> (raw)
In-Reply-To: <20260202070752.3391-1-lukagejak5@gmail.com>
Remove Windows NDIS-style type aliases and replace with standard Linux
kernel types:
- Remove NDIS_802_11_MAC_ADDRESS typedef, use u8[ETH_ALEN] directly
- Remove NDIS_802_11_RATES typedef (unused)
- Remove NDIS_802_11_RATES_EX typedef, use u8[NDIS_802_11_LENGTH_RATES_EX]
- Remove NDIS_802_11_PMKID_VALUE typedef (unused)
- Update struct wlan_bssid_ex and struct FW_Sta_Info members
- Replace sizeof(NDIS_802_11_MAC_ADDRESS) with ETH_ALEN
This makes the code more readable and follows Linux kernel coding style
by using explicit types instead of Windows-style typedefs.
Signed-off-by: Luka Gejak <lukagejak5@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +-
drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 3 ---
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8723bs/include/wlan_bssdef.h | 12 ++++--------
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
5 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
index 3e80d03c4ec9..f67732e44082 100644
--- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
@@ -492,7 +492,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
u32 rtw_init_bcmc_stainfo(struct adapter *padapter)
{
struct sta_info *psta;
- NDIS_802_11_MAC_ADDRESS bcast_addr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+ u8 bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct sta_priv *pstapriv = &padapter->stapriv;
/* struct __queue *pstapending = &padapter->xmitpriv.bm_pending; */
diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
index ab349de733c8..d8dd4b6d7aca 100644
--- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
@@ -7,9 +7,6 @@
#ifndef __RTW_IOCTL_SET_H_
#define __RTW_IOCTL_SET_H_
-
-typedef u8 NDIS_802_11_PMKID_VALUE[16];
-
u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode);
u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep);
u8 rtw_set_802_11_disassociate(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index dd5080056e58..e6d4c47a6729 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -253,7 +253,7 @@ struct FW_Sta_Info {
u32 status;
u32 rx_pkt;
u32 retry;
- NDIS_802_11_RATES_EX SupportedRates;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
};
/*
diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
index eb38594c8f5c..7071bd1a02fa 100644
--- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
@@ -15,10 +15,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#define NDIS_802_11_LENGTH_RATES_EX 16
-typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
-typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; /* Set of 8 data rates */
-typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; /* Set of 16 data rates */
-
struct ndis_802_11_ssid {
u32 ssid_length;
u8 ssid[32];
@@ -64,10 +60,10 @@ struct ndis_80211_var_ie {
};
/* Length is the 4 bytes multiples of the sum of
- * sizeof (NDIS_802_11_MAC_ADDRESS) + 2 +
+ * 6 (mac_address) + 2 +
* sizeof (struct ndis_802_11_ssid) + sizeof (u32) +
* sizeof (long) + sizeof (enum ndis_802_11_network_type) +
- * sizeof (struct ndis_802_11_conf) + sizeof (NDIS_802_11_RATES_EX) + ie_length
+ * sizeof (struct ndis_802_11_conf) + 16 (supported_rates) + ie_length
*
* Except for ie_length, all other fields are fixed length. Therefore, we can
* define a macro to present the partial sum.
@@ -155,7 +151,7 @@ struct wlan_bcn_info {
*/
struct wlan_bssid_ex {
u32 length;
- NDIS_802_11_MAC_ADDRESS mac_address;
+ u8 mac_address[ETH_ALEN];
u8 reserved[2];/* 0]: IS beacon frame */
struct ndis_802_11_ssid ssid;
u32 privacy;
@@ -163,7 +159,7 @@ struct wlan_bssid_ex {
enum ndis_802_11_network_type network_type_in_use;
struct ndis_802_11_conf configuration;
enum ndis_802_11_network_infrastructure infrastructure_mode;
- NDIS_802_11_RATES_EX supported_rates;
+ u8 supported_rates[NDIS_802_11_LENGTH_RATES_EX];
struct wlan_phy_info phy_info;
u32 ie_length;
u8 ies[MAX_IE_SZ]; /* timestamp, beacon interval, and capability information) */
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 60edeae1cffe..5488940ffe2e 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -378,7 +378,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
return;
}
if (!memcmp(&(scanned->network.ssid), &(pnetwork->ssid), sizeof(struct ndis_802_11_ssid))
- && !memcmp(scanned->network.mac_address, pnetwork->mac_address, sizeof(NDIS_802_11_MAC_ADDRESS))
+ && !memcmp(scanned->network.mac_address, pnetwork->mac_address, ETH_ALEN)
)
rtw_cfg80211_inform_bss(padapter, scanned);
else
@@ -419,7 +419,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
goto check_bss;
}
- if (!memcmp(scanned->network.mac_address, pnetwork->mac_address, sizeof(NDIS_802_11_MAC_ADDRESS))
+ if (!memcmp(scanned->network.mac_address, pnetwork->mac_address, ETH_ALEN)
&& !memcmp(&(scanned->network.ssid), &(pnetwork->ssid), sizeof(struct ndis_802_11_ssid))
)
rtw_cfg80211_inform_bss(padapter, scanned);
--
2.52.0
next prev parent reply other threads:[~2026-02-02 7:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 7:07 [PATCH v1 0/5] staging: rtl8723bs: code cleanup and style fixes Luka Gejak
2026-02-02 7:07 ` [PATCH v1 1/5] staging: rtl8723bs: remove unused code for other Realtek chips Luka Gejak
2026-02-02 8:36 ` Greg Kroah-Hartman
2026-02-02 7:07 ` [PATCH v1 2/5] staging: rtl8723bs: convert PSTA_INFO_T to struct sta_info * Luka Gejak
2026-02-02 7:07 ` Luka Gejak [this message]
2026-02-02 7:07 ` [PATCH v1 4/5] staging: rtl8723bs: remove redundant MAC_ARG macro Luka Gejak
2026-02-02 7:07 ` [PATCH v1 5/5] staging: rtl8723bs: fix LONG_LINE warnings across C files Luka Gejak
2026-02-02 8:35 ` Greg Kroah-Hartman
2026-02-02 8:36 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260202070752.3391-4-lukagejak5@gmail.com \
--to=lukagejak5@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox