From: Ivan Safonov <insafonov@gmail.com>
To: devel@driverdev.osuosl.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Vaishali Thakkar" <vthakkar1994@gmail.com>,
"Jakub Sitnicki" <jsitnicki@gmail.com>,
"Anish Bhatt" <anish@gatech.edu>, "Joe Perches" <joe@perches.com>,
"Ivan Safonov" <insafonov@gmail.com>,
"Nicholas Mc Guire" <der.herr@hofr.at>,
"Alexey Khoroshilov" <khoroshilov@ispras.ru>,
"Rémy Oudompheng" <remyoudompheng@gmail.com>,
"Sudip Mukherjee" <sudipm.mukherjee@gmail.com>,
"Shraddha Barke" <shraddha.6596@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 01/12] staging: rtl8188eu: if/else replaced by min_t
Date: Sun, 8 Nov 2015 14:07:11 +0700 [thread overview]
Message-ID: <20151108070711.GA1463@alpha.sfu-kras.ru> (raw)
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
next reply other threads:[~2015-11-08 7:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-08 7:07 Ivan Safonov [this message]
2015-11-08 17:10 ` Greg Kroah-Hartman
2015-11-10 9:13 ` Ivan Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151108070711.GA1463@alpha.sfu-kras.ru \
--to=insafonov@gmail.com \
--cc=anish@gatech.edu \
--cc=der.herr@hofr.at \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=jsitnicki@gmail.com \
--cc=khoroshilov@ispras.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=remyoudompheng@gmail.com \
--cc=shraddha.6596@gmail.com \
--cc=sudipm.mukherjee@gmail.com \
--cc=vthakkar1994@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®