replace custom functions with kernel network
cover replace custom functions with kernel network
This series replaces custom functions for checking mac address type with standard kernel functions from linux/etherdevice.h designed for this purpose.
Patches 1/5 and 2/5 will fix checkpatch.pl warnings for future patches.
Nikolay Kulikov (5):
staging: rtl8723bs: replace deeply nested if-else with switch-case
staging: rtl8723bs: move logical operators to end of previous line
staging: rtl8723bs: remove custom is_zero_mac_addr() function
staging: rtl8723bs: remove custom is_broadcast_mac_addr() function
staging: rtl8723bs: remove custom is_multicast_mac_addr() function
.../staging/rtl8723bs/core/rtw_ioctl_set.c | 8 ++-- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 48 +++++++++++-------- drivers/staging/rtl8723bs/core/rtw_security.c | 4 +- drivers/staging/rtl8723bs/include/ieee80211.h | 17 ------- 5 files changed, 34 insertions(+), 45 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/5 staging: rtl8723bs: replace deeply nested if-else with switch-case
The main logic of the validate_recv_mgnt_frame() function is deeply nested due to multiple if-else statements and additional block scope. Fix this by replacing identical if-else with switch-case statements, which will improve code readability and correct checkpatch.pl warnings about line lengths.
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 48 +++++++++++++---------- 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +28 -20
@@ -1250,33 +1250,41 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union restatic signed int validate_recv_mgnt_frame (struct adapter *padapter,union recv_frame *precv_frame) {/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */ +struct sta_info *psta =NULL ; precv_frame =recvframe_chk_defrag (padapter, precv_frame);if (!precv_frame)return _SUCCESS; - { -/* for rx pkt statistics */ -struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); - -if (psta) { - psta->sta_stats.rx_mgnt_pkts++; -if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_BEACON ) - psta->sta_stats.rx_beacon_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBEREQ ) - psta->sta_stats.rx_probereq_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBERSP ) { -if (!memcmp (padapter->eeprompriv.mac_addr,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)) || -is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) - psta->sta_stats.rx_probersp_bm_pkts++; -else - psta->sta_stats.rx_probersp_uo_pkts++; - } - } +/* for rx pkt statistics */ + psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); +if (!psta) + goto exit; + + psta->sta_stats.rx_mgnt_pkts++; + +switch (GetFrameSubType (precv_frame->u.hdr.rx_data)) { +case WIFI_BEACON : + psta->sta_stats.rx_beacon_pkts++; +break ; +case WIFI_PROBEREQ : + psta->sta_stats.rx_probereq_pkts++; +break ; +case WIFI_PROBERSP : +if (!memcmp (padapter->eeprompriv.mac_addr, +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)) || +is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) + psta->sta_stats.rx_probersp_bm_pkts++; +else + psta->sta_stats.rx_probersp_uo_pkts++; + +break ; } +exit:mgt_dispatcher (padapter, precv_frame);return _SUCCESS;
Signature · 1 line
2.53.0
Re: [PATCH 1/5] staging: rtl8723bs: replace deeply nested if-else with switch-case
Quoted 11 lines · Nikolay Kulikov
The main logic of the
validate_recv_mgnt_frame()function is deeply nested due to multiple if-else statements and additional block scope. Fix this by replacing identical if-else with switch-case statements, which will improve code readability and correct checkpatch.pl warnings about line lengths.Signed-off-by Nikolay Kulikov <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_recv.c | 48 +++++++++++++---------- 1 file changed, 28 insertions(+), 20 deletions(-)
...
Quoted 1 line
/* struct
mlme_priv*pmlmepriv =&adapter->mlmepriv; */
Maybe create a patch to delete this commented out code since you're already here.
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re · line 1253
Quoted 1 line
drivers/staging/rtl8723bs/core/rtw_recv.c +1
-0+struct sta_info *psta =NULL ;
You don't have to declare this as NULL rtw_get_stainfo() returns NULL.
Quoted 19 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +0
-14precv_frame =recvframe_chk_defrag (padapter, precv_frame);if (!precv_frame)return _SUCCESS; - { -/* for rx pkt statistics */ -struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); - -if (psta) { - psta->sta_stats.rx_mgnt_pkts++; -if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_BEACON ) - psta->sta_stats.rx_beacon_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBEREQ ) - psta->sta_stats.rx_probereq_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBERSP ) { -if (!memcmp (padapter->eeprompriv.mac_addr,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)) ||
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re · line 1262
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +4
-6- is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) - psta->sta_stats.rx_probersp_bm_pkts++; - else - psta->sta_stats.rx_probersp_uo_pkts++; - } - } +/* for rx pkt statistics */ + psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); +if (!psta) + goto exit;
Instead of adding a goto here, it'd be easier to read if this was just wrapped in an if statement.
Thanks,
ET
Re: [PATCH 1/5] staging: rtl8723bs: replace deeply nested if-else with switch-case
Quoted 16 lines · Ethan Tidmore
Quoted 11 lines · Nikolay Kulikov
The main logic of the
validate_recv_mgnt_frame()function is deeply nested due to multiple if-else statements and additional block scope. Fix this by replacing identical if-else with switch-case statements, which will improve code readability and correct checkpatch.pl warnings about line lengths.Signed-off-by Nikolay Kulikov <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_recv.c | 48 +++++++++++++---------- 1 file changed, 28 insertions(+), 20 deletions(-)...
Quoted 9 lines
Quoted 1 line
/* struct
mlme_priv*pmlmepriv =&adapter->mlmepriv; */Maybe create a patch to delete this commented out code since you're already here.
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re · line 1253
Quoted 1 line
drivers/staging/rtl8723bs/core/rtw_recv.c +1
-0+struct sta_info *psta =NULL ;You don't have to declare this as NULL
rtw_get_stainfo()returns NULL.
I will do it in v2.
Quoted 24 lines
Quoted 24 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +0
-19precv_frame =recvframe_chk_defrag (padapter, precv_frame);if (!precv_frame)return _SUCCESS; - { -/* for rx pkt statistics */ -struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); - -if (psta) { - psta->sta_stats.rx_mgnt_pkts++; -if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_BEACON ) - psta->sta_stats.rx_beacon_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBEREQ ) - psta->sta_stats.rx_probereq_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBERSP ) { -if (!memcmp (padapter->eeprompriv.mac_addr,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)) || -is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) - psta->sta_stats.rx_probersp_bm_pkts++; -else - psta->sta_stats.rx_probersp_uo_pkts++; - }
Quoted 8 lines
drivers/staging/rtl8723bs/core/rtw_recv.c static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union re · line 1262
Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_recv.c +4
-1- } +/* for rx pkt statistics */ + psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); +if (!psta) + goto exit;Instead of adding a goto here, it'd be easier to read if this was just wrapped in an if statement.
According to the Kernel Coding style (Section 1), heavy indentation should be avoided. If we wrap all of this in:
if (psta) {
...
}then there will be four tabs before the deepest lines, leaving little room for the actual work, and the reader will have ro remember too much context from all the conditions.
Thanks,
Nikolay
PATCH 2/5 staging: rtl8723bs: move logical operators to end of previous line
In reply to Nikolay KulikovChange the position of logical operators '||' and remove unnecessary curly braces around single expression to fix checkpatch.pl warnings.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +3 -5
@@ -11,12 +11,10 @@ u8 rtw_validate_bssid(u8 *bssid) {u8 ret = true; -if (is_zero_mac_addr (bssid) - ||is_broadcast_mac_addr (bssid) - ||is_multicast_mac_addr (bssid) - ) { +if (is_zero_mac_addr (bssid) || +is_broadcast_mac_addr (bssid) || +is_multicast_mac_addr (bssid)) ret = false; - }return ret; }
Signature · 1 line
2.53.0
PATCH 3/5 staging: rtl8723bs: remove custom is_zero_mac_addr() function
In reply to Nikolay KulikovRemove the custom function is_zero_mac_addr() and replace all calls to it with the default kernel function is_zero_ether_addr() to avoid duplicating existing code.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -11,7 +11,7 @@ u8 rtw_validate_bssid(u8 *bssid) {u8 ret = true; -if (is_zero_mac_addr (bssid) || +if (is_zero_ether_addr (bssid) ||is_broadcast_mac_addr (bssid) ||is_multicast_mac_addr (bssid)) ret = false;
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1694,7 +1694,7 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme goto exit;/* got specific addr to roam */ -if (!is_zero_mac_addr (mlme->roam_tgt_addr)) { +if (!is_zero_ether_addr (mlme->roam_tgt_addr)) {if (!memcmp (mlme->roam_tgt_addr, competitor->network.mac_address,ETH_ALEN )) goto update;else
drivers/staging/rtl8723bs/include/ieee80211.h +0 -6
@@ -518,12 +518,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr) (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); } -static inline int is_zero_mac_addr (const u8 *addr) -{ -return ((addr[0 ] ==0x00 ) && (addr[1 ] ==0x00 ) && (addr[2 ] ==0x00 ) && \ - (addr[3 ] ==0x00 ) && (addr[4 ] ==0x00 ) && (addr[5 ] ==0x00 )); -} -#define CFG_IEEE80211_RESERVE_FCS (1<<0)#define CFG_IEEE80211_COMPUTE_FCS (1<<1)
Signature · 1 line
2.53.0
PATCH 4/5 staging: rtl8723bs: remove custom is_broadcast_mac_addr() function
In reply to Nikolay KulikovReplace the custom broadcast address checking function with standard kernel is_broadcast_ether_addr() func for this.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/core/rtw_security.c | 4 ++-- drivers/staging/rtl8723bs/include/ieee80211.h | 6 ------ 4 files changed, 4 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -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;
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -1275,7 +1275,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
drivers/staging/rtl8723bs/core/rtw_security.c +2 -2
@@ -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++;
@@ -1223,7 +1223,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++;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -6
@@ -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)
Signature · 1 line
2.53.0
PATCH 5/5 staging: rtl8723bs: remove custom is_multicast_mac_addr() function
In reply to Nikolay Kulikovis_multicast_mac_addr() is redundant reimplementation of standard is_multicast_ether_addr() func.
Remove it and switch to use is_multicast_ether_addr().
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -13,7 +13,7 @@ u8 rtw_validate_bssid(u8 *bssid)if (is_zero_ether_addr (bssid) ||is_broadcast_ether_addr (bssid) || -is_multicast_mac_addr (bssid)) +is_multicast_ether_addr (bssid)) ret = false;return ret;
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -1276,7 +1276,7 @@ static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_ ETH_ALEN)) psta->sta_stats.rx_probersp_pkts++; else if (is_broadcast_ether_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) || - is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) + is_multicast_ether_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) psta->sta_stats.rx_probersp_bm_pkts++; else psta->sta_stats.rx_probersp_uo_pkts++;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -5
@@ -507,11 +507,6 @@ Total: 28-2340 bytes#define DEFAULT_FTS 2346#define IP_ARG (x) (x) -static inline int is_multicast_mac_addr (const u8 *addr) -{ -return ((addr[0 ] !=0xff ) && (0x01 & addr[0 ])); -} -#define CFG_IEEE80211_RESERVE_FCS (1<<0)#define CFG_IEEE80211_COMPUTE_FCS (1<<1)
Signature · 1 line
2.53.0
v2 cover replace custom functions with kernel network functions
In reply to Nikolay KulikovThis series replaces custom functions for checking mac address type with standard kernel functions from linux/etherdevice.h designed for this purpose.
Patches 1 - 3 will fix checkpatch.pl warnings for future patches.
Changes in v2:
- remove initialization of local pointer as NULL (patch 1/5)
- add commit to remove dead code in rtw_recv.c (patch 2/5)
Nikolay Kulikov (6):
staging: rtl8723bs: replace deeply nested if-else with switch-case
staging: rtl8723bs: remove dead code in validate_recv_mgnt_frame()
staging: rtl8723bs: move logical operators to end of previous line
staging: rtl8723bs: remove custom is_zero_mac_addr() function
staging: rtl8723bs: remove custom is_broadcast_mac_addr() function
staging: rtl8723bs: remove custom is_multicast_mac_addr() function
.../staging/rtl8723bs/core/rtw_ioctl_set.c | 8 ++- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 49 +++++++++++-------- drivers/staging/rtl8723bs/core/rtw_security.c | 4 +- drivers/staging/rtl8723bs/include/ieee80211.h | 17 ------- 5 files changed, 34 insertions(+), 46 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/6 staging: rtl8723bs: replace deeply nested if-else with switch-case
The main logic of the validate_recv_mgnt_frame() function is deeply nested due to multiple if-else statements and additional block scope. Fix this by replacing identical if-else with switch-case statements, which will improve code readability and correct checkpatch.pl warnings about line lengths.
---
Changes in v2:
- leave 'psta' uninizialized
drivers/staging/rtl8723bs/core/rtw_recv.c | 48 +++++++++++++---------- 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +28 -20
@@ -1250,33 +1250,41 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union restatic signed int validate_recv_mgnt_frame (struct adapter *padapter,union recv_frame *precv_frame) {/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */ +struct sta_info *psta; precv_frame =recvframe_chk_defrag (padapter, precv_frame);if (!precv_frame)return _SUCCESS; - { -/* for rx pkt statistics */ -struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); - -if (psta) { - psta->sta_stats.rx_mgnt_pkts++; -if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_BEACON ) - psta->sta_stats.rx_beacon_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBEREQ ) - psta->sta_stats.rx_probereq_pkts++; -else if (GetFrameSubType (precv_frame->u.hdr.rx_data) ==WIFI_PROBERSP ) { -if (!memcmp (padapter->eeprompriv.mac_addr,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)) || -is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) - psta->sta_stats.rx_probersp_bm_pkts++; -else - psta->sta_stats.rx_probersp_uo_pkts++; - } - } +/* for rx pkt statistics */ + psta =rtw_get_stainfo (&padapter->stapriv,GetAddr2Ptr (precv_frame->u.hdr.rx_data)); +if (!psta) + goto exit; + + psta->sta_stats.rx_mgnt_pkts++; + +switch (GetFrameSubType (precv_frame->u.hdr.rx_data)) { +case WIFI_BEACON : + psta->sta_stats.rx_beacon_pkts++; +break ; +case WIFI_PROBEREQ : + psta->sta_stats.rx_probereq_pkts++; +break ; +case WIFI_PROBERSP : +if (!memcmp (padapter->eeprompriv.mac_addr, +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)) || +is_multicast_mac_addr (GetAddr1Ptr (precv_frame->u.hdr.rx_data))) + psta->sta_stats.rx_probersp_bm_pkts++; +else + psta->sta_stats.rx_probersp_uo_pkts++; + +break ; } +exit:mgt_dispatcher (padapter, precv_frame);return _SUCCESS;
Signature · 1 line
2.53.0
PATCH v2 2/6 staging: rtl8723bs: remove dead code in validate_recv_mgnt_frame()
In reply to Nikolay KulikovRemove unused code from the validate_recv_mgnt_frame() function. This code was previously commented out and is no longer needed.
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -1
@@ -1249,7 +1249,6 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union restatic signed int validate_recv_mgnt_frame (struct adapter *padapter,union recv_frame *precv_frame) { -/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */ struct sta_info *psta; precv_frame =recvframe_chk_defrag (padapter, precv_frame);
Signature · 1 line
2.53.0
PATCH v2 3/6 staging: rtl8723bs: move logical operators to end of previous line
In reply to Nikolay KulikovChange the position of logical operators '||' and remove unnecessary curly braces around single expression to fix checkpatch.pl warnings.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +3 -5
@@ -11,12 +11,10 @@ u8 rtw_validate_bssid(u8 *bssid) {u8 ret = true; -if (is_zero_mac_addr (bssid) - ||is_broadcast_mac_addr (bssid) - ||is_multicast_mac_addr (bssid) - ) { +if (is_zero_mac_addr (bssid) || +is_broadcast_mac_addr (bssid) || +is_multicast_mac_addr (bssid)) ret = false; - }return ret; }
Signature · 1 line
2.53.0
PATCH v2 4/6 staging: rtl8723bs: remove custom is_zero_mac_addr() function
In reply to Nikolay KulikovRemove the custom function is_zero_mac_addr() and replace all calls to it with the default kernel function is_zero_ether_addr() to avoid duplicating existing code.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -11,7 +11,7 @@ u8 rtw_validate_bssid(u8 *bssid) {u8 ret = true; -if (is_zero_mac_addr (bssid) || +if (is_zero_ether_addr (bssid) ||is_broadcast_mac_addr (bssid) ||is_multicast_mac_addr (bssid)) ret = false;
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1694,7 +1694,7 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme goto exit;/* got specific addr to roam */ -if (!is_zero_mac_addr (mlme->roam_tgt_addr)) { +if (!is_zero_ether_addr (mlme->roam_tgt_addr)) {if (!memcmp (mlme->roam_tgt_addr, competitor->network.mac_address,ETH_ALEN )) goto update;else
drivers/staging/rtl8723bs/include/ieee80211.h +0 -6
@@ -518,12 +518,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr) (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); } -static inline int is_zero_mac_addr (const u8 *addr) -{ -return ((addr[0 ] ==0x00 ) && (addr[1 ] ==0x00 ) && (addr[2 ] ==0x00 ) && \ - (addr[3 ] ==0x00 ) && (addr[4 ] ==0x00 ) && (addr[5 ] ==0x00 )); -} -#define CFG_IEEE80211_RESERVE_FCS (1<<0)#define CFG_IEEE80211_COMPUTE_FCS (1<<1)
Signature · 1 line
2.53.0
PATCH v2 5/6 staging: rtl8723bs: remove custom is_broadcast_mac_addr() function
In reply to Nikolay KulikovReplace the custom broadcast address checking function with standard kernel is_broadcast_ether_addr() func for this.
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/core/rtw_security.c | 4 ++-- drivers/staging/rtl8723bs/include/ieee80211.h | 6 ------ 4 files changed, 4 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -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;
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -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
drivers/staging/rtl8723bs/core/rtw_security.c +2 -2
@@ -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++;
@@ -1223,7 +1223,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++;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -6
@@ -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)
Signature · 1 line
2.53.0
PATCH v2 6/6 staging: rtl8723bs: remove custom is_multicast_mac_addr() function
In reply to Nikolay Kulikovis_multicast_mac_addr() is redundant reimplementation of standard is_multicast_ether_addr() func.
Remove it and switch to use is_multicast_ether_addr().
--- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -13,7 +13,7 @@ u8 rtw_validate_bssid(u8 *bssid)if (is_zero_ether_addr (bssid) ||is_broadcast_ether_addr (bssid) || -is_multicast_mac_addr (bssid)) +is_multicast_ether_addr (bssid)) ret = false;return ret;
drivers/staging/rtl8723bs/core/rtw_recv.c +1 -1
@@ -1275,7 +1275,7 @@ static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_ ETH_ALEN)) psta->sta_stats.rx_probersp_pkts++; else if (is_broadcast_ether_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data)) || - is_multicast_mac_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) + is_multicast_ether_addr(GetAddr1Ptr(precv_frame->u.hdr.rx_data))) psta->sta_stats.rx_probersp_bm_pkts++; else psta->sta_stats.rx_probersp_uo_pkts++;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -5
@@ -507,11 +507,6 @@ Total: 28-2340 bytes#define DEFAULT_FTS 2346#define IP_ARG (x) (x) -static inline int is_multicast_mac_addr (const u8 *addr) -{ -return ((addr[0 ] !=0xff ) && (0x01 & addr[0 ])); -} -#define CFG_IEEE80211_RESERVE_FCS (1<<0)#define CFG_IEEE80211_COMPUTE_FCS (1<<1)
Signature · 1 line
2.53.0