iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: rtl8192e: Replace ?: with min_t

Browse Source 
Replace :? with min_t for readability. Remove check that is always false.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-05-31 20:19:46 +02:00 committed by Greg Kroah-Hartman
parent a94aa9adb6
commit a5c06ad83b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/rtl8192e/rtllib_softmac_wx.c
View File

@ -454,13 +454,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee,
proto_started = ieee->proto_started; proto_started = ieee->proto_started;
len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? wrqu->essid.length : len = min_t(__u16, wrqu->essid.length, IW_ESSID_MAX_SIZE);
IW_ESSID_MAX_SIZE;
if (len > IW_ESSID_MAX_SIZE) {
ret = -E2BIG;
goto out;
}
if (ieee->iw_mode == IW_MODE_MONITOR) { if (ieee->iw_mode == IW_MODE_MONITOR) {
ret = -1; ret = -1;

3
drivers/staging/rtl8192e/rtllib_wx.c
View File

@ -851,8 +851,7 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
if ((eid == MFIE_TYPE_GENERIC) && (!memcmp(&ie[2], if ((eid == MFIE_TYPE_GENERIC) && (!memcmp(&ie[2],
wps_oui, 4))) { wps_oui, 4))) {
ieee->wps_ie_len = (len < MAX_WZC_IE_LEN) ? (len) : ieee->wps_ie_len = min_t(size_t, len, MAX_WZC_IE_LEN);
(MAX_WZC_IE_LEN);
buf = kmemdup(ie, ieee->wps_ie_len, GFP_KERNEL); buf = kmemdup(ie, ieee->wps_ie_len, GFP_KERNEL);
if (buf == NULL) if (buf == NULL)
return -ENOMEM; return -ENOMEM;