* [PATCH 01/13] staging: rtl8188eu: if/else replaced by min_t
@ 2015-11-08 4:29 Ivan Safonov
2015-11-08 10:08 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Ivan Safonov @ 2015-11-08 4:29 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 related [flat|nested] 2+ messages in thread
* Re: [PATCH 01/13] staging: rtl8188eu: if/else replaced by min_t
2015-11-08 4:29 [PATCH 01/13] staging: rtl8188eu: if/else replaced by min_t Ivan Safonov
@ 2015-11-08 10:08 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2015-11-08 10:08 UTC (permalink / raw)
To: Ivan Safonov
Cc: devel, Greg Kroah-Hartman, Vaishali Thakkar, Jakub Sitnicki,
Anish Bhatt, Joe Perches, Nicholas Mc Guire, Alexey Khoroshilov,
Rémy Oudompheng, Sudip Mukherjee, Shraddha Barke,
linux-kernel
On Sun, Nov 8, 2015 at 6:29 AM, Ivan Safonov <insafonov@gmail.com> wrote:
> 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));
256 is a magic number. Like I said earlier, it seems a sizeof of
corresponding member.
>
> psecnetwork->IELength = 0;
> /* Added by Albert 2009/02/18 */
> --
> 2.4.10
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-08 10:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-08 4:29 [PATCH 01/13] staging: rtl8188eu: if/else replaced by min_t Ivan Safonov
2015-11-08 10:08 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.