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

Commit ad8d8cd3 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 20e76531

drivers/staging/rtl8188eu/core/rtw_ap.c

+1 −1
Original line number Diff line number Diff line
@@ -1795,7 +1795,7 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset) 
		plist = plist->next;



		issue_action_spct_ch_switch(padapter, psta->hwaddr, new_ch, ch_offset);

		psta->expire_to = ((pstapriv->expire_to * 2) > 5) ? 5 : (pstapriv->expire_to * 2);

		psta->expire_to = min_t(unsigned int, pstapriv->expire_to * 2, 5);

	}

	spin_unlock_bh(&pstapriv->asoc_list_lock);

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1392,6 +1392,6 @@ static const char *_action_public_str[] = { 


const char *action_public_str(u8 action)

{

	action = (action >= ACT_PUBLIC_MAX) ? ACT_PUBLIC_MAX : action;

	action = min_t(u8, action, ACT_PUBLIC_MAX);

	return _action_public_str[action];

}

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static void issue_beacon(struct adapter *padapter, int timeout_ms) 


	/*  supported rates... */

	rate_len = rtw_get_rateset_len(cur_network->SupportedRates);

	pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8) ? 8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);

	pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, min_t(unsigned int, rate_len, 8), cur_network->SupportedRates, &pattrib->pktlen);



	/*  DS parameter set */

	pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);
@@ -578,7 +578,7 @@ static void issue_probersp(struct adapter *padapter, unsigned char *da) 


		/*  supported rates... */

		rate_len = rtw_get_rateset_len(cur_network->SupportedRates);

		pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, ((rate_len > 8) ? 8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);

		pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_, min_t(unsigned int, rate_len, 8), cur_network->SupportedRates, &pattrib->pktlen);



		/*  DS parameter set */

		pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);

drivers/staging/rtl8188eu/core/rtw_wlan_util.c

+2 −2
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ unsigned int update_basic_rate(unsigned char *ptn, unsigned int ptn_sz) 
	unsigned int i, num_of_rate;

	unsigned int mask = 0;



	num_of_rate = (ptn_sz > NumRates) ? NumRates : ptn_sz;

	num_of_rate = min_t(unsigned int, ptn_sz, NumRates);



	for (i = 0; i < num_of_rate; i++) {

		if ((*(ptn + i)) & 0x80)
@@ -1241,7 +1241,7 @@ unsigned int update_supported_rate(unsigned char *ptn, unsigned int ptn_sz) 
	unsigned int i, num_of_rate;

	unsigned int mask = 0;



	num_of_rate = (ptn_sz > NumRates) ? NumRates : ptn_sz;

	num_of_rate = min_t(unsigned int, ptn_sz, NumRates);



	for (i = 0; i < num_of_rate; i++)

		mask |= 0x1 << wifirate2_ratetbl_inx(*(ptn + i));

drivers/staging/rtl8188eu/hal/odm_HWConfig.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm, 
			OFDM_pkt += (u8)(pEntry->rssi_stat.PacketMap>>i) & BIT(0);



		if (pEntry->rssi_stat.ValidBit == 64) {

			Weighting = ((OFDM_pkt<<4) > 64) ? 64 : (OFDM_pkt<<4);

			Weighting = min_t(u32, OFDM_pkt << 4, 64);

			UndecoratedSmoothedPWDB = (Weighting*UndecoratedSmoothedOFDM+(64-Weighting)*UndecoratedSmoothedCCK)>>6;

		} else {

			if (pEntry->rssi_stat.ValidBit != 0)