staging: rtl8723bs: remove unusual 'NDIS_802_11_MAC_ADDRESS' type
PATCH 1/1 staging: rtl8723bs: remove unusual 'NDIS_802_11_MAC_ADDRESS' type
Remove the 'NDIS_802_11_MAC_ADDRESS' type and replace all variables of this type with an array of 'u8', which will make the code more understandable and get rid of unnecessary 'typedef'.
Signed-off-by Nikolay Kulikov <[email protected]>
---
Also format the corrected lines to fix checkpatch.pl checks.
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 5 ++--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +1 -1
@@ -491,7 +491,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; */
drivers/staging/rtl8723bs/include/wlan_bssdef.h +2 -3
@@ -15,7 +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 */
@@ -64,7 +63,7 @@ struct ndis_80211_var_ie { };/* Length is the 4 bytes multiples of the sum of -* sizeof (NDIS_802_11_MAC_ADDRESS) + 2 + +* ETH_ALEN + 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
@@ -155,7 +154,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;
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +6 -6
@@ -380,9 +380,9 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)rtw_warn_on (1 );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 )) - ) +if (!memcmp (&scanned->network.ssid, &pnetwork->ssid, +sizeof (struct ndis_802_11_ssid )) && + !memcmp (scanned->network.mac_address, pnetwork->mac_address,ETH_ALEN ))rtw_cfg80211_inform_bss (padapter, scanned);else rtw_warn_on (1 );
@@ -422,9 +422,9 @@ 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 )) - && !memcmp (&(scanned->network.ssid), &(pnetwork->ssid),sizeof (struct ndis_802_11_ssid )) - ) +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);else rtw_warn_on (1 );
Signature · 1 line
2.53.0