Commit ac5951a6 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove rtw_wx_set_rate handler function 



Remove rtw_wx_set_rate handler function, which currently handles the
SIOCSIWRATE wext ioctl. This function (although containing a lot of
code) set nothing outside its own local variables, and did nothing other
than call a now removed debugging statement repeatedly. Removing it and
leaving its associated entry in rtw_handlers as NULL is therefore the
better option. Removing this function also fixes a kernel test robot
warning.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210625191658.1299-1-phil@philpotter.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 363963c2

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+0 −75
Original line number Diff line number Diff line
@@ -1262,80 +1262,6 @@ static int rtw_wx_get_essid(struct net_device *dev, 
	return 0;

}



static int rtw_wx_set_rate(struct net_device *dev,

			   struct iw_request_info *a,

			   union iwreq_data *wrqu, char *extra)

{

	int i;

	u8 datarates[NumRates];

	u32	target_rate = wrqu->bitrate.value;

	u32	fixed = wrqu->bitrate.fixed;

	u32	ratevalue = 0;

	u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};



	if (target_rate == -1) {

		ratevalue = 11;

		goto set_rate;

	}

	target_rate /= 100000;



	switch (target_rate) {

	case 10:

		ratevalue = 0;

		break;

	case 20:

		ratevalue = 1;

		break;

	case 55:

		ratevalue = 2;

		break;

	case 60:

		ratevalue = 3;

		break;

	case 90:

		ratevalue = 4;

		break;

	case 110:

		ratevalue = 5;

		break;

	case 120:

		ratevalue = 6;

		break;

	case 180:

		ratevalue = 7;

		break;

	case 240:

		ratevalue = 8;

		break;

	case 360:

		ratevalue = 9;

		break;

	case 480:

		ratevalue = 10;

		break;

	case 540:

		ratevalue = 11;

		break;

	default:

		ratevalue = 11;

		break;

	}



set_rate:



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

		if (ratevalue == mpdatarate[i]) {

			datarates[i] = mpdatarate[i];

			if (fixed == 0)

				break;

		} else {

			datarates[i] = 0xff;

		}

	}



	return 0;

}



static int rtw_wx_get_rate(struct net_device *dev,

			   struct iw_request_info *info,

			   union iwreq_data *wrqu, char *extra)
@@ -2715,7 +2641,6 @@ static iw_handler rtw_handlers[] = { 
	IW_HANDLER(SIOCSIWESSID, rtw_wx_set_essid),

	IW_HANDLER(SIOCGIWESSID, rtw_wx_get_essid),

	IW_HANDLER(SIOCGIWNICKN, rtw_wx_get_nick),

	IW_HANDLER(SIOCSIWRATE, rtw_wx_set_rate),

	IW_HANDLER(SIOCGIWRATE, rtw_wx_get_rate),

	IW_HANDLER(SIOCSIWRTS, rtw_wx_set_rts),

	IW_HANDLER(SIOCGIWRTS, rtw_wx_get_rts),