diff options
| author | Ivan Safonov <insafonov@gmail.com> | 2015-10-27 22:19:50 +0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 09:09:08 +0900 |
| commit | 530c9b1b21fc41fd54c1c4f0f4b05368304c0105 (patch) | |
| tree | 887e45a20752c7047cc78c76ed5db9582dd542a9 /drivers/staging/rtl8188eu/os_dep | |
| parent | ad8d8cd3b507fd72a64a61412623450740182828 (diff) | |
| download | linux-530c9b1b21fc41fd54c1c4f0f4b05368304c0105.tar.bz2 | |
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')
| -rw-r--r-- | drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c index 9c11ef4bc88f..a076ede50b22 100644 --- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c @@ -2669,7 +2669,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) int copy_len; wpa_ie_len = psta->wpa_ie[1]; - copy_len = ((wpa_ie_len+2) > sizeof(psta->wpa_ie)) ? (sizeof(psta->wpa_ie)) : (wpa_ie_len+2); + copy_len = min_t(int, wpa_ie_len + 2, sizeof(psta->wpa_ie)); param->u.wpa_ie.len = copy_len; memcpy(param->u.wpa_ie.reserved, psta->wpa_ie, copy_len); } else { |