summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNavaneeth K <knavaneeth786@gmail.com>2025-11-25 11:20:56 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-11-26 14:21:02 +0100
commit6ddb173fcf34f4b9351a20f29e31aa2bc3f90574 (patch)
tree8cc51d09d52abf2d9376776807f33d3c74ad5aa0
parente09748f874422f71b21cc1c0628743d445b2b2c6 (diff)
staging: rtl8723bs: use standard offsetof in cfg80211 operations
Replace usage of the custom FIELD_OFFSET macro with the standard offsetof() macro in ioctl_cfg80211.c. This improves code readability and uses the kernel's standard mechanism. Also include <linux/stddef.h> in basic_types.h to ensure offsetof() is available for this and future conversions. Signed-off-by: Navaneeth K <knavaneeth786@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/20251125112059.16913-3-knavaneeth786@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8723bs/include/basic_types.h1
-rw-r--r--drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723bs/include/basic_types.h b/drivers/staging/rtl8723bs/include/basic_types.h
index 1c2da18e6210..16b270fe0203 100644
--- a/drivers/staging/rtl8723bs/include/basic_types.h
+++ b/drivers/staging/rtl8723bs/include/basic_types.h
@@ -12,6 +12,7 @@
#define FAIL (-1)
#include <linux/types.h>
+#include <linux/stddef.h>
#define FIELD_OFFSET(s, field) ((__kernel_ssize_t)&((s *)(0))->field)
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 315bab373729..60edeae1cffe 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1712,7 +1712,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
if (wep_key_len > 0) {
wep_key_len = wep_key_len <= 5 ? 5 : 13;
- wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material);
+ wep_total_len = wep_key_len +
+ offsetof(struct ndis_802_11_wep, key_material);
pwep = rtw_malloc(wep_total_len);
if (!pwep) {
ret = -ENOMEM;