* [PATCH 1/5] staging: r8188eu: use standard multicast addr check
2022-10-23 17:08 [PATCH 0/5] staging: r8188eu: some more small cleanups Martin Kaiser
@ 2022-10-23 17:08 ` Martin Kaiser
2022-10-23 17:08 ` [PATCH 2/5] staging: r8188eu: don't set pcmd_obj components to 0 Martin Kaiser
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-10-23 17:08 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
Use is_multicast_ether_addr to check for a multicast address instead of
reimplementing this check in the driver.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 2 +-
drivers/staging/r8188eu/include/wifi.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
index bbde5c03f9ae..51324e708697 100644
--- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c
@@ -404,7 +404,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
if (!hwaddr)
return NULL;
- if (IS_MCAST(hwaddr))
+ if (is_multicast_ether_addr(hwaddr))
addr = bc_addr;
else
addr = hwaddr;
diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
index 381385a7e118..fdb7c1bf3573 100644
--- a/drivers/staging/r8188eu/include/wifi.h
+++ b/drivers/staging/r8188eu/include/wifi.h
@@ -236,11 +236,6 @@ enum WIFI_REG_DOMAIN {
#define GetAddr4Ptr(pbuf) ((unsigned char *)((size_t)(pbuf) + 24))
-static inline bool IS_MCAST(unsigned char *da)
-{
- return (*da) & 0x01;
-}
-
static inline unsigned char *get_da(unsigned char *pframe)
{
unsigned char *da;
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/5] staging: r8188eu: don't set pcmd_obj components to 0
2022-10-23 17:08 [PATCH 0/5] staging: r8188eu: some more small cleanups Martin Kaiser
2022-10-23 17:08 ` [PATCH 1/5] staging: r8188eu: use standard multicast addr check Martin Kaiser
@ 2022-10-23 17:08 ` Martin Kaiser
2022-10-23 17:08 ` [PATCH 3/5] staging: r8188eu: NetworkTypeInUse is not in use Martin Kaiser
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-10-23 17:08 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
pcmd_obj was allocated with kzalloc, its memory is filled with 0s.
There's no need to set rsp and rspsz to NULL or 0 again.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index d146b94307b8..8050f682c997 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -6753,9 +6753,6 @@ void report_join_res(struct adapter *padapter, int res)
pcmd_obj->cmdsz = cmdsz;
pcmd_obj->parmbuf = pevtcmd;
- pcmd_obj->rsp = NULL;
- pcmd_obj->rspsz = 0;
-
pc2h_evt_hdr = (struct C2HEvent_Header *)(pevtcmd);
pc2h_evt_hdr->len = sizeof(struct joinbss_event);
pc2h_evt_hdr->ID = GEN_EVT_CODE(_JoinBss);
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 3/5] staging: r8188eu: NetworkTypeInUse is not in use
2022-10-23 17:08 [PATCH 0/5] staging: r8188eu: some more small cleanups Martin Kaiser
2022-10-23 17:08 ` [PATCH 1/5] staging: r8188eu: use standard multicast addr check Martin Kaiser
2022-10-23 17:08 ` [PATCH 2/5] staging: r8188eu: don't set pcmd_obj components to 0 Martin Kaiser
@ 2022-10-23 17:08 ` Martin Kaiser
2022-10-23 17:08 ` [PATCH 4/5] staging: r8188eu: remove wait_ack param from _issue_probereq_p2p Martin Kaiser
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-10-23 17:08 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
NetworkTypeInUse from struct wlan_bssid_ex is not used. Remove
NetworkTypeInUse itself, the code to set it and the enum for its
possible values.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 16 ----------------
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 ---
drivers/staging/r8188eu/include/wlan_bssdef.h | 9 ---------
3 files changed, 28 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 1f69e5c57d5d..a47ae33454b3 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -1819,22 +1819,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
pdev_network->Rssi = 0;
- switch (pregistrypriv->wireless_mode) {
- case WIRELESS_11B:
- pdev_network->NetworkTypeInUse = (Ndis802_11DS);
- break;
- case WIRELESS_11G:
- case WIRELESS_11BG:
- case WIRELESS_11_24N:
- case WIRELESS_11G_24N:
- case WIRELESS_11BG_24N:
- pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
- break;
- default:
- /* TODO */
- break;
- }
-
pdev_network->Configuration.DSConfig = (pregistrypriv->channel);
if (cur_network->network.InfrastructureMode == Ndis802_11IBSS)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 8050f682c997..61d2680cbafc 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -6188,9 +6188,6 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st
memcpy(bssid->SupportedRates + i, (p + 2), len);
}
- /* todo: */
- bssid->NetworkTypeInUse = Ndis802_11OFDM24;
-
if (bssid->IELength < 12)
return _FAIL;
diff --git a/drivers/staging/r8188eu/include/wlan_bssdef.h b/drivers/staging/r8188eu/include/wlan_bssdef.h
index 81bda91a4136..831c465df500 100644
--- a/drivers/staging/r8188eu/include/wlan_bssdef.h
+++ b/drivers/staging/r8188eu/include/wlan_bssdef.h
@@ -17,14 +17,6 @@ struct ndis_802_11_ssid {
u8 Ssid[32];
};
-enum NDIS_802_11_NETWORK_TYPE {
- Ndis802_11FH,
- Ndis802_11DS,
- Ndis802_11OFDM5,
- Ndis802_11OFDM24,
- Ndis802_11NetworkTypeMax /* dummy upper bound */
-};
-
struct ndis_802_11_config_fh {
u32 Length; /* Length of structure */
u32 HopPattern; /* As defined by 802.11, MSB set */
@@ -233,7 +225,6 @@ struct wlan_bssid_ex {
struct ndis_802_11_ssid Ssid;
u32 Privacy;
NDIS_802_11_RSSI Rssi;/* in dBM,raw data ,get from PHY) */
- enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
struct ndis_802_11_config Configuration;
enum ndis_802_11_network_infra InfrastructureMode;
unsigned char SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 4/5] staging: r8188eu: remove wait_ack param from _issue_probereq_p2p
2022-10-23 17:08 [PATCH 0/5] staging: r8188eu: some more small cleanups Martin Kaiser
` (2 preceding siblings ...)
2022-10-23 17:08 ` [PATCH 3/5] staging: r8188eu: NetworkTypeInUse is not in use Martin Kaiser
@ 2022-10-23 17:08 ` Martin Kaiser
2022-10-23 17:08 ` [PATCH 5/5] staging: r8188eu: bCardDisableWOHSM is write-only Martin Kaiser
2022-10-24 5:33 ` [PATCH 0/5] staging: r8188eu: some more small cleanups Philipp Hortmann
5 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-10-23 17:08 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
The only caller of _issue_probereq_p2p sets wait_ack = false. Remove the
wait_ack parameter and the code that would run only if wait_ack == true.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 61d2680cbafc..d44e455f09ca 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -3291,7 +3291,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)
dump_mgntframe(padapter, pmgntframe);
}
-static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
+static int _issue_probereq_p2p(struct adapter *padapter, u8 *da)
{
int ret = _FAIL;
struct xmit_frame *pmgntframe;
@@ -3564,12 +3564,8 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
pattrib->last_txcmdsz = pattrib->pktlen;
- if (wait_ack) {
- ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
- } else {
- dump_mgntframe(padapter, pmgntframe);
- ret = _SUCCESS;
- }
+ dump_mgntframe(padapter, pmgntframe);
+ ret = _SUCCESS;
exit:
return ret;
@@ -3577,7 +3573,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
inline void issue_probereq_p2p(struct adapter *adapter, u8 *da)
{
- _issue_probereq_p2p(adapter, da, false);
+ _issue_probereq_p2p(adapter, da);
}
static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token)
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 5/5] staging: r8188eu: bCardDisableWOHSM is write-only
2022-10-23 17:08 [PATCH 0/5] staging: r8188eu: some more small cleanups Martin Kaiser
` (3 preceding siblings ...)
2022-10-23 17:08 ` [PATCH 4/5] staging: r8188eu: remove wait_ack param from _issue_probereq_p2p Martin Kaiser
@ 2022-10-23 17:08 ` Martin Kaiser
2022-10-24 5:33 ` [PATCH 0/5] staging: r8188eu: some more small cleanups Philipp Hortmann
5 siblings, 0 replies; 7+ messages in thread
From: Martin Kaiser @ 2022-10-23 17:08 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel, Martin Kaiser
bCardDisableWOHSM in struct adapter is only written but never read.
It can be removed.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ----
2 files changed, 5 deletions(-)
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 1bd0c8f3a358..8fef5759c36a 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -167,7 +167,6 @@ struct adapter {
s32 bDriverStopped;
s32 bSurpriseRemoved;
- s32 bCardDisableWOHSM;
u8 hw_init_completed;
s8 signal_strength;
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 38e324754c8f..970f380bac96 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -620,7 +620,6 @@ static int _netdev_open(struct net_device *pnetdev)
if (!padapter->bup) {
padapter->bDriverStopped = false;
padapter->bSurpriseRemoved = false;
- padapter->bCardDisableWOHSM = false;
status = rtw_hal_init(padapter);
if (status == _FAIL)
@@ -686,7 +685,6 @@ static int ips_netdrv_open(struct adapter *padapter)
padapter->bDriverStopped = false;
padapter->bSurpriseRemoved = false;
- padapter->bCardDisableWOHSM = false;
status = rtw_hal_init(padapter);
if (status == _FAIL)
@@ -718,13 +716,11 @@ int rtw_ips_pwr_up(struct adapter *padapter)
void rtw_ips_pwr_down(struct adapter *padapter)
{
- padapter->bCardDisableWOHSM = true;
padapter->net_closed = true;
rtw_led_control(padapter, LED_CTL_POWER_OFF);
rtw_ips_dev_unload(padapter);
- padapter->bCardDisableWOHSM = false;
}
static void rtw_fifo_cleanup(struct adapter *adapter)
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] staging: r8188eu: some more small cleanups
2022-10-23 17:08 [PATCH 0/5] staging: r8188eu: some more small cleanups Martin Kaiser
` (4 preceding siblings ...)
2022-10-23 17:08 ` [PATCH 5/5] staging: r8188eu: bCardDisableWOHSM is write-only Martin Kaiser
@ 2022-10-24 5:33 ` Philipp Hortmann
5 siblings, 0 replies; 7+ messages in thread
From: Philipp Hortmann @ 2022-10-24 5:33 UTC (permalink / raw)
To: Martin Kaiser, Greg Kroah-Hartman
Cc: Larry Finger, Phillip Potter, Michael Straube, Pavel Skripkin,
linux-staging, linux-kernel
On 10/23/22 19:08, Martin Kaiser wrote:
> Here's another series with simple cleanups in several places.
> Tested with EdimaxV2 on an arm32 system.
>
> Martin Kaiser (5):
> staging: r8188eu: use standard multicast addr check
> staging: r8188eu: don't set pcmd_obj components to 0
> staging: r8188eu: NetworkTypeInUse is not in use
> staging: r8188eu: remove wait_ack param from _issue_probereq_p2p
> staging: r8188eu: bCardDisableWOHSM is write-only
>
> drivers/staging/r8188eu/core/rtw_mlme.c | 16 ----------------
> drivers/staging/r8188eu/core/rtw_mlme_ext.c | 18 ++++--------------
> drivers/staging/r8188eu/core/rtw_sta_mgt.c | 2 +-
> drivers/staging/r8188eu/include/drv_types.h | 1 -
> drivers/staging/r8188eu/include/wifi.h | 5 -----
> drivers/staging/r8188eu/include/wlan_bssdef.h | 9 ---------
> drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ----
> 7 files changed, 5 insertions(+), 50 deletions(-)
>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
^ permalink raw reply [flat|nested] 7+ messages in thread