diff options
| author | Nikolay Kulikov <nikolayof23@gmail.com> | 2026-03-23 18:06:07 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-31 10:32:05 +0200 |
| commit | 1ee677634567ac4ca9d6141e89f08ca0e5f5d7ae (patch) | |
| tree | 9d34fc6f0b099ada35a27e8447700702eabe48d2 | |
| parent | 93854e4dd543e2818d7afe91ada55442cb820646 (diff) | |
staging: rtl8723bs: remove custom is_broadcast_mac_addr() function
Replace the custom broadcast address checking function with standard
kernel is_broadcast_ether_addr() func for this.
Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
Link: https://patch.msgid.link/20260323150650.7168-6-nikolayof23@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_recv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_security.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/ieee80211.h | 6 |
4 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c index c20a143ace4b..904ff0e14ec5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -12,7 +12,7 @@ u8 rtw_validate_bssid(u8 *bssid) u8 ret = true; if (is_zero_ether_addr(bssid) || - is_broadcast_mac_addr(bssid) || + is_broadcast_ether_addr(bssid) || is_multicast_mac_addr(bssid)) ret = false; diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index c5182438fd05..09cff9499a59 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1274,7 +1274,7 @@ static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_ GetAddr1Ptr(precv_frame->u.hdr.rx_data), ETH_ALEN)) psta->sta_stats.rx_probersp_pkts++; - else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) || + else if (is_broadcast_ether_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) || is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) psta->sta_stats.rx_probersp_bm_pkts++; else diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c index 8f1f960b7535..4edcbd95aab3 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -531,7 +531,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) if (start == 0) start = jiffies; - if (is_broadcast_mac_addr(prxattrib->ra)) + if (is_broadcast_ether_addr(prxattrib->ra)) no_gkey_bc_cnt++; else no_gkey_mc_cnt++; @@ -1225,7 +1225,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) if (start == 0) start = jiffies; - if (is_broadcast_mac_addr(prxattrib->ra)) + if (is_broadcast_ether_addr(prxattrib->ra)) no_gkey_bc_cnt++; else no_gkey_mc_cnt++; diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h index 37b9b363c073..c3e06e693495 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -512,12 +512,6 @@ static inline int is_multicast_mac_addr(const u8 *addr) return ((addr[0] != 0xff) && (0x01 & addr[0])); } -static inline int is_broadcast_mac_addr(const u8 *addr) -{ - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); -} - #define CFG_IEEE80211_RESERVE_FCS (1<<0) #define CFG_IEEE80211_COMPUTE_FCS (1<<1) |