[PATCH v2 01/12] staging: rtl8188eu: if/else replaced by min_t

[PATCH v2 01/12] staging: rtl8188eu: if/else replaced by min_t

[Ivan Safonov]

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

Re: [PATCH v2 01/12] staging: rtl8188eu: if/else replaced by min_t

[Greg Kroah-Hartman]

On Sun, Nov 08, 2015 at 02:07:11PM +0700, Ivan Safonov 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(-)

You sent 3 versions of this patch, is this series the "real" one?  When
you resend, you need to say why you resent things, below the --- line
put the difference between v1 and v2 there so that we know what changed.

So I'm going to assume that the v2 series is the one you want to have
applied, if this isn't correct, please let me know.

thanks,

greg k-h

Re: [PATCH v2 01/12] staging: rtl8188eu: if/else replaced by min_t

[Ivan Safonov]

On 11/09/2015 12:10 AM, Greg Kroah-Hartman wrote:
> On Sun, Nov 08, 2015 at 02:07:11PM +0700, Ivan Safonov 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(-)
> You sent 3 versions of this patch, is this series the "real" one?  When
> you resend, you need to say why you resent things, below the --- line
> put the difference between v1 and v2 there so that we know what changed.
>
> So I'm going to assume that the v2 series is the one you want to have
> applied, if this isn't correct, please let me know.
>
> thanks,
>
> greg k-h

Yes, that's right, the second version is the only correct.