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

Commit 725fef14 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt28x0: remove private RTPRIV_IOCTL_GSITESURVEY ioctl 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 468d0c50

drivers/staging/rt2860/common/cmm_info.c

+0 −57
Original line number Diff line number Diff line
@@ -1969,63 +1969,6 @@ VOID RTMPCommSiteSurveyData( 
	return;

}



VOID RTMPIoctlGetSiteSurvey(

	IN	PRTMP_ADAPTER	pAdapter,

	IN	struct iwreq	*wrq)

{

	PSTRING		msg;

	INT		i=0;

	INT			WaitCnt;

	INT		Status=0;

    INT         max_len = LINE_LEN;

	PBSS_ENTRY	pBss;





	os_alloc_mem(NULL, (PUCHAR *)&msg, sizeof(CHAR)*((MAX_LEN_OF_BSS_TABLE)*max_len));



	if (msg == NULL)

	{

		DBGPRINT(RT_DEBUG_TRACE, ("RTMPIoctlGetSiteSurvey - msg memory alloc fail.\n"));

		return;

	}



	memset(msg, 0 ,(MAX_LEN_OF_BSS_TABLE)*max_len );

	sprintf(msg,"%s","\n");

	sprintf(msg+strlen(msg),"%-4s%-33s%-20s%-23s%-9s%-7s%-7s%-3s\n",

	    "Ch", "SSID", "BSSID", "Security", "Siganl(%)", "W-Mode", " ExtCH"," NT");







	WaitCnt = 0;

	pAdapter->StaCfg.bScanReqIsFromWebUI = TRUE;

	while ((ScanRunning(pAdapter) == TRUE) && (WaitCnt++ < 200))

		OS_WAIT(500);



	for(i=0; i<pAdapter->ScanTab.BssNr ;i++)

	{

		pBss = &pAdapter->ScanTab.BssEntry[i];



		if( pBss->Channel==0)

			break;



		if((strlen(msg)+max_len ) >= IW_SCAN_MAX_DATA)

			break;





		RTMPCommSiteSurveyData(msg, pBss);





	}



	pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;

	wrq->u.data.length = strlen(msg);

	Status = copy_to_user(wrq->u.data.pointer, msg, wrq->u.data.length);



	DBGPRINT(RT_DEBUG_TRACE, ("RTMPIoctlGetSiteSurvey - wrq->u.data.length = %d\n", wrq->u.data.length));

	os_free_mem(NULL, (PUCHAR)msg);

}





#define	MAC_LINE_LEN	(14+4+4+10+10+10+6+6)	// Addr+aid+psm+datatime+rxbyte+txbyte+current tx rate+last tx rate

VOID RTMPIoctlGetMacTable(

	IN PRTMP_ADAPTER pAd,

drivers/staging/rt2860/rtmp.h

+0 −12
Original line number Diff line number Diff line
@@ -4991,18 +4991,6 @@ PNDIS_PACKET RTMPDeFragmentDataFrame( 
	IN	PRTMP_ADAPTER	pAd,

	IN	RX_BLK			*pRxBlk);



////////////////////////////////////////



VOID RTMPIoctlGetSiteSurvey(

	IN	PRTMP_ADAPTER	pAdapter,

	IN	struct iwreq	*wrq);















enum {

	DIDmsg_lnxind_wlansniffrm		= 0x00000044,

	DIDmsg_lnxind_wlansniffrm_hosttime	= 0x00010044,

drivers/staging/rt2860/sta_ioctl.c

+1 −3
Original line number Diff line number Diff line
@@ -2979,6 +2979,7 @@ INT rt28xx_sta_ioctl( 
		case RT_PRIV_IOCTL:

		case RT_PRIV_IOCTL_EXT:

		case RTPRIV_IOCTL_SET:

		case RTPRIV_IOCTL_GSITESURVEY:

			Status = -EOPNOTSUPP;

			break;

		case SIOCGIWPRIV:
@@ -2991,9 +2992,6 @@ INT rt28xx_sta_ioctl( 
					Status = -EFAULT;

			}

			break;

		case RTPRIV_IOCTL_GSITESURVEY:

			RTMPIoctlGetSiteSurvey(pAd, wrq);

		    break;

        case SIOCETHTOOL:

                break;

		default: