* [PATCH 01/12] staging: rtl8188eu: if/else replaced by min_t
@ 2015-11-08 6:36 Ivan Safonov
0 siblings, 0 replies; only message in thread
From: Ivan Safonov @ 2015-11-08 6:36 UTC (permalink / raw)
To: devel
Cc: Greg Kroah-Hartman, Vaishali Thakkar, Jakub Sitnicki,
Anish Bhatt, Joe Perches, Ivan Safonov, Nicholas Mc Guire,
Alexey Khoroshilov, Rémy Oudompheng, Sudip Mukherjee,
Shraddha Barke, linux-kernel
Duplicated code removed.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 433b926..69f8744d9 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -442,10 +442,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->IELength;
- if ((psecnetwork->IELength-12) < (256-1))
- memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);
- else
- memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
+ memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12],
+ min_t(size_t, psecnetwork->IELength - 12, 256 - 1));
psecnetwork->IELength = 0;
/* Added by Albert 2009/02/18 */
--
2.4.10
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-08 6:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-08 6:36 [PATCH 01/12] staging: rtl8188eu: if/else replaced by min_t Ivan Safonov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®