* [PATCH 0/2] staging: r8188eu: two simple cleanups
@ 2023-03-07 8:50 Michael Straube
2023-03-07 8:50 ` [PATCH 1/2] staging: r8188eu: busetkipkey is boolean Michael Straube
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Michael Straube @ 2023-03-07 8:50 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
This series contains two simple cleanups.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (2):
staging: r8188eu: busetkipkey is boolean
staging: r8188eu: bgrpkey_handshake is set but never used
drivers/staging/r8188eu/core/rtw_mlme.c | 1 -
drivers/staging/r8188eu/core/rtw_recv.c | 2 +-
drivers/staging/r8188eu/core/rtw_xmit.c | 2 +-
drivers/staging/r8188eu/include/rtw_security.h | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
--
2.39.2
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] staging: r8188eu: busetkipkey is boolean
2023-03-07 8:50 [PATCH 0/2] staging: r8188eu: two simple cleanups Michael Straube
@ 2023-03-07 8:50 ` Michael Straube
2023-03-07 8:50 ` [PATCH 2/2] staging: r8188eu: bgrpkey_handshake is set but never used Michael Straube
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Michael Straube @ 2023-03-07 8:50 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The field busetkipkey of struct security_priv is set to boolean
values only. Remove unneeded comparisions from if statements that
use this field.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_recv.c | 2 +-
drivers/staging/r8188eu/core/rtw_xmit.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c
index fc7568cf948b..741c17121c9b 100644
--- a/drivers/staging/r8188eu/core/rtw_recv.c
+++ b/drivers/staging/r8188eu/core/rtw_recv.c
@@ -471,7 +471,7 @@ static struct recv_frame *decryptor(struct adapter *padapter, struct recv_frame
break;
}
} else if (prxattrib->bdecrypted == 1 && prxattrib->encrypt > 0 &&
- (psecuritypriv->busetkipkey == 1 || prxattrib->encrypt != _TKIP_))
+ (psecuritypriv->busetkipkey || prxattrib->encrypt != _TKIP_))
psecuritypriv->hw_decrypted = true;
if (res == _FAIL) {
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index df88b3e29e77..cc3894101673 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -626,7 +626,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
pattrib->iv_len = 8;
pattrib->icv_len = 4;
- if (padapter->securitypriv.busetkipkey == _FAIL) {
+ if (!padapter->securitypriv.busetkipkey) {
res = _FAIL;
goto exit;
}
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] staging: r8188eu: bgrpkey_handshake is set but never used
2023-03-07 8:50 [PATCH 0/2] staging: r8188eu: two simple cleanups Michael Straube
2023-03-07 8:50 ` [PATCH 1/2] staging: r8188eu: busetkipkey is boolean Michael Straube
@ 2023-03-07 8:50 ` Michael Straube
2023-03-07 19:11 ` [PATCH 0/2] staging: r8188eu: two simple cleanups Philipp Hortmann
2023-03-09 9:09 ` Greg KH
3 siblings, 0 replies; 8+ messages in thread
From: Michael Straube @ 2023-03-07 8:50 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
The field bgrpkey_handshake of struct security_priv is set but never
used. Remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme.c | 1 -
drivers/staging/r8188eu/include/rtw_security.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index fb7d0e161fdd..809ac0317db2 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -944,7 +944,6 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {
padapter->securitypriv.binstallGrpkey = false;
padapter->securitypriv.busetkipkey = false;
- padapter->securitypriv.bgrpkey_handshake = false;
psta->ieee8021x_blocked = true;
psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm;
memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype));
diff --git a/drivers/staging/r8188eu/include/rtw_security.h b/drivers/staging/r8188eu/include/rtw_security.h
index 783ae18a122a..8c187de7a522 100644
--- a/drivers/staging/r8188eu/include/rtw_security.h
+++ b/drivers/staging/r8188eu/include/rtw_security.h
@@ -116,7 +116,6 @@ struct security_priv {
u8 binstallGrpkey;
u8 busetkipkey;
u8 bcheck_grpkey;
- u8 bgrpkey_handshake;
s32 sw_encrypt;/* from registry_priv */
s32 sw_decrypt;/* from registry_priv */
s32 hw_decrypted;/* if the rx packets is hw_decrypted==false,i
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] staging: r8188eu: two simple cleanups
2023-03-07 8:50 [PATCH 0/2] staging: r8188eu: two simple cleanups Michael Straube
2023-03-07 8:50 ` [PATCH 1/2] staging: r8188eu: busetkipkey is boolean Michael Straube
2023-03-07 8:50 ` [PATCH 2/2] staging: r8188eu: bgrpkey_handshake is set but never used Michael Straube
@ 2023-03-07 19:11 ` Philipp Hortmann
2023-03-09 9:09 ` Greg KH
3 siblings, 0 replies; 8+ messages in thread
From: Philipp Hortmann @ 2023-03-07 19:11 UTC (permalink / raw)
To: Michael Straube, gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel
On 3/7/23 09:50, Michael Straube wrote:
> This series contains two simple cleanups.
>
> Tested on x86_64 with Inter-Tech DMG-02.
>
> Michael Straube (2):
> staging: r8188eu: busetkipkey is boolean
> staging: r8188eu: bgrpkey_handshake is set but never used
>
> drivers/staging/r8188eu/core/rtw_mlme.c | 1 -
> drivers/staging/r8188eu/core/rtw_recv.c | 2 +-
> drivers/staging/r8188eu/core/rtw_xmit.c | 2 +-
> drivers/staging/r8188eu/include/rtw_security.h | 1 -
> 4 files changed, 2 insertions(+), 4 deletions(-)
>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] staging: r8188eu: two simple cleanups
2023-03-07 8:50 [PATCH 0/2] staging: r8188eu: two simple cleanups Michael Straube
` (2 preceding siblings ...)
2023-03-07 19:11 ` [PATCH 0/2] staging: r8188eu: two simple cleanups Philipp Hortmann
@ 2023-03-09 9:09 ` Greg KH
3 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2023-03-09 9:09 UTC (permalink / raw)
To: Michael Straube; +Cc: Larry.Finger, phil, linux-staging, linux-kernel
On Tue, Mar 07, 2023 at 09:50:01AM +0100, Michael Straube wrote:
> This series contains two simple cleanups.
>
> Tested on x86_64 with Inter-Tech DMG-02.
>
> Michael Straube (2):
> staging: r8188eu: busetkipkey is boolean
> staging: r8188eu: bgrpkey_handshake is set but never used
>
> drivers/staging/r8188eu/core/rtw_mlme.c | 1 -
> drivers/staging/r8188eu/core/rtw_recv.c | 2 +-
> drivers/staging/r8188eu/core/rtw_xmit.c | 2 +-
> drivers/staging/r8188eu/include/rtw_security.h | 1 -
> 4 files changed, 2 insertions(+), 4 deletions(-)
>
> --
> 2.39.2
>
>
Sorry, but I've now deleted this driver, so these patches do not apply.
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] staging: r8188eu: two simple cleanups
@ 2022-11-01 19:14 Michael Straube
2022-11-01 23:26 ` Philipp Hortmann
0 siblings, 1 reply; 8+ messages in thread
From: Michael Straube @ 2022-11-01 19:14 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
This series contains two simple cleanup patches.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (2):
staging: r8188eu: remove extern from function prototypes
staging: r8188eu: convert rtw_free_stainfo() to void
drivers/staging/r8188eu/core/rtw_sta_mgt.c | 8 ++------
.../staging/r8188eu/include/osdep_service.h | 2 +-
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 ++--
drivers/staging/r8188eu/include/sta_info.h | 18 +++++++++---------
4 files changed, 14 insertions(+), 18 deletions(-)
--
2.38.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] staging: r8188eu: two simple cleanups
2022-11-01 19:14 Michael Straube
@ 2022-11-01 23:26 ` Philipp Hortmann
0 siblings, 0 replies; 8+ messages in thread
From: Philipp Hortmann @ 2022-11-01 23:26 UTC (permalink / raw)
To: Michael Straube, gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel
On 11/1/22 20:14, Michael Straube wrote:
> This series contains two simple cleanup patches.
> Tested on x86_64 with Inter-Tech DMG-02.
>
> Michael Straube (2):
> staging: r8188eu: remove extern from function prototypes
> staging: r8188eu: convert rtw_free_stainfo() to void
>
> drivers/staging/r8188eu/core/rtw_sta_mgt.c | 8 ++------
> .../staging/r8188eu/include/osdep_service.h | 2 +-
> drivers/staging/r8188eu/include/rtw_mlme_ext.h | 4 ++--
> drivers/staging/r8188eu/include/sta_info.h | 18 +++++++++---------
> 4 files changed, 14 insertions(+), 18 deletions(-)
>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] staging: r8188eu: two simple cleanups
@ 2022-02-09 7:36 Michael Straube
0 siblings, 0 replies; 8+ messages in thread
From: Michael Straube @ 2022-02-09 7:36 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, phil, linux-staging, linux-kernel, Michael Straube
This set removes an unused enum and unused constants from the enum
hw_variables.
Michael Straube (2):
staging: r8188eu: remove unused enum
staging: r8188eu: clean up enum hw_variables
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 8 --------
drivers/staging/r8188eu/include/hal_intf.h | 17 -----------------
2 files changed, 25 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-03-09 9:09 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-07 8:50 [PATCH 0/2] staging: r8188eu: two simple cleanups Michael Straube
2023-03-07 8:50 ` [PATCH 1/2] staging: r8188eu: busetkipkey is boolean Michael Straube
2023-03-07 8:50 ` [PATCH 2/2] staging: r8188eu: bgrpkey_handshake is set but never used Michael Straube
2023-03-07 19:11 ` [PATCH 0/2] staging: r8188eu: two simple cleanups Philipp Hortmann
2023-03-09 9:09 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2022-11-01 19:14 Michael Straube
2022-11-01 23:26 ` Philipp Hortmann
2022-02-09 7:36 Michael Straube
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).