On Sun, Nov 8, 2015 at 6:29 AM, Ivan Safonov <insafonov@xxxxxxxxx> wrote: > Duplicated code removed. > > Signed-off-by: Ivan Safonov <insafonov@xxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxx > 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 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
