Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 530c9b1b authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: ternary operator (?:) replaced by min_t kernel macro 



min_t macro better conveys the meaning of the code.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ad8d8cd3

drivers/staging/rtl8188eu/core/rtw_efuse.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static void efuse_read_phymap_from_txpktbuf( 
			aaa = le16_to_cpup((__le16 *)&lo32);

			len = le16_to_cpu(*((__le16 *)&lo32));



			limit = (len-2 < limit) ? len-2 : limit;

			limit = min_t(u16, len-2, limit);



			DBG_88E("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", __func__, len, lenbak, aaa, aaabak);

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -3239,7 +3239,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, 
			pstat->flags |= WLAN_STA_WPS;

			copy_len = 0;

		} else {

			copy_len = ((wpa_ie_len+2) > sizeof(pstat->wpa_ie)) ? (sizeof(pstat->wpa_ie)) : (wpa_ie_len+2);

			copy_len = min_t(int, wpa_ie_len + 2, sizeof(pstat->wpa_ie));

		}

		if (copy_len > 0)

			memcpy(pstat->wpa_ie, wpa_ie-2, copy_len);

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {