diff options
| author | Ivan Safonov | 2015-10-27 16:18:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-29 01:09:08 +0100 |
| commit | ad8d8cd3b507fd72a64a61412623450740182828 (patch) | |
| tree | 3c1857ebee95654dafca4f087b9d601648f38fe1 /drivers/staging/rtl8188eu/os_dep/mlme_linux.c | |
| parent | staging: rtl8188eu: ternary operator (?:) replaced by min/max kernel macro (diff) | |
| download | kernel-qcow2-linux-ad8d8cd3b507fd72a64a61412623450740182828.tar.gz kernel-qcow2-linux-ad8d8cd3b507fd72a64a61412623450740182828.tar.xz kernel-qcow2-linux-ad8d8cd3b507fd72a64a61412623450740182828.zip | |
staging: rtl8188eu: ternary operator (?:) replaced by min_t kernel macro
min_t macro better conveys the meaning of the code.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep/mlme_linux.c')
| -rw-r--r-- | drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c index eb8ecb7fbd16..08bfa76f4975 100644 --- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c @@ -116,14 +116,13 @@ void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie) p = buff; p += sprintf(p, "ASSOCINFO(ReqIEs ="); len = sec_ie[1]+2; - len = (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX; + len = min_t(uint, len, IW_CUSTOM_MAX); for (i = 0; i < len; i++) p += sprintf(p, "%02x", sec_ie[i]); p += sprintf(p, ")"); memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = p-buff; - wrqu.data.length = (wrqu.data.length < IW_CUSTOM_MAX) ? - wrqu.data.length : IW_CUSTOM_MAX; + wrqu.data.length = min_t(__u16, wrqu.data.length, IW_CUSTOM_MAX); wireless_send_event(adapter->pnetdev, IWEVCUSTOM, &wrqu, buff); kfree(buff); } |