Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbbKHKIm (ORCPT ); Sun, 8 Nov 2015 05:08:42 -0500 Received: from mail-yk0-f176.google.com ([209.85.160.176]:34688 "EHLO mail-yk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412AbbKHKIi (ORCPT ); Sun, 8 Nov 2015 05:08:38 -0500 MIME-Version: 1.0 In-Reply-To: <20151108042951.GA27831@alpha.sfu-kras.ru> References: <20151108042951.GA27831@alpha.sfu-kras.ru> Date: Sun, 8 Nov 2015 12:08:37 +0200 Message-ID: Subject: Re: [PATCH 01/13] staging: rtl8188eu: if/else replaced by min_t From: Andy Shevchenko To: Ivan Safonov Cc: devel@driverdev.osuosl.org, Greg Kroah-Hartman , Vaishali Thakkar , Jakub Sitnicki , Anish Bhatt , Joe Perches , Nicholas Mc Guire , Alexey Khoroshilov , =?UTF-8?Q?R=C3=A9my_Oudompheng?= , Sudip Mukherjee , Shraddha Barke , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1840 Lines: 48 On Sun, Nov 8, 2015 at 6:29 AM, Ivan Safonov wrote: > Duplicated code removed. > > Signed-off-by: Ivan Safonov > --- > 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 -- 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/