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

Commit a5c06ad8 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Replace ?: with min_t 



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

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a94aa9ad

drivers/staging/rtl8192e/rtllib_softmac_wx.c

+1 −7
Original line number Diff line number Diff line
@@ -454,13 +454,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, 


	proto_started = ieee->proto_started;



	len = (wrqu->essid.length < IW_ESSID_MAX_SIZE) ? wrqu->essid.length :

	       IW_ESSID_MAX_SIZE;



	if (len > IW_ESSID_MAX_SIZE) {

		ret = -E2BIG;

		goto out;

	}

	len = min_t(__u16, wrqu->essid.length, IW_ESSID_MAX_SIZE);



	if (ieee->iw_mode == IW_MODE_MONITOR) {

		ret = -1;

drivers/staging/rtl8192e/rtllib_wx.c

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

		     wps_oui, 4))) {



			ieee->wps_ie_len = (len < MAX_WZC_IE_LEN) ? (len) :

					   (MAX_WZC_IE_LEN);

			ieee->wps_ie_len = min_t(size_t, len, MAX_WZC_IE_LEN);

			buf = kmemdup(ie, ieee->wps_ie_len, GFP_KERNEL);

			if (buf == NULL)

				return -ENOMEM;