From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: "Greg Kroah-Hartman" <gregkh@suse.de>
Cc: devel@driverdev.osuosl.org,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 04/12] Staging: rt28x0: remove private RTPRIV_IOCTL_GSITESURVEY ioctl
Date: Wed, 21 Oct 2009 22:44:12 +0200 [thread overview]
Message-ID: <20091021204412.4593.80397.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20091021204344.4593.99070.sendpatchset@localhost.localdomain>
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] Staging: rt28x0: remove private RTPRIV_IOCTL_GSITESURVEY ioctl
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/staging/rt2860/common/cmm_info.c | 57 -------------------------------
drivers/staging/rt2860/rtmp.h | 12 ------
drivers/staging/rt2860/sta_ioctl.c | 4 --
3 files changed, 1 insertion(+), 72 deletions(-)
Index: b/drivers/staging/rt2860/common/cmm_info.c
===================================================================
--- a/drivers/staging/rt2860/common/cmm_info.c
+++ b/drivers/staging/rt2860/common/cmm_info.c
@@ -1970,63 +1970,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,
Index: b/drivers/staging/rt2860/rtmp.h
===================================================================
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -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,
Index: b/drivers/staging/rt2860/sta_ioctl.c
===================================================================
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -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:
next prev parent reply other threads:[~2009-10-21 20:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-21 20:43 [PATCH 00/12] Staging: rt28x0 cleanups Bartlomiej Zolnierkiewicz
2009-10-21 20:43 ` [PATCH 01/12] Staging: rt28x0: remove unused ->eewrite methods Bartlomiej Zolnierkiewicz
2009-10-21 20:43 ` [PATCH 02/12] Staging: rt28x0: remove unused code from common/ee_efuse-c Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` [PATCH 03/12] Staging: rt28x0: remove private RTPRIV_IOCTL_SET ioctl Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` Bartlomiej Zolnierkiewicz [this message]
2009-10-21 20:44 ` [PATCH 05/12] Staging: rt28x0: remove private WEXT handlers Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` [PATCH 06/12] Staging: rt28x0: remove support for private driver parameters Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` [PATCH 07/12] Staging: rt28x0: remove optional loading of EEPROM from file in eFuse mode Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` [PATCH 08/12] Staging: rt28x0: fix some build warnings Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` [PATCH 09/12] Staging: rt28x0: remove optional cmm profile parameters Bartlomiej Zolnierkiewicz
2009-10-21 20:44 ` [PATCH 10/12] Staging: rt28x0: remove dead code from rtmp_phy.h Bartlomiej Zolnierkiewicz
2009-10-21 20:45 ` [PATCH 11/12] Staging: rt28x0: remove unused SHA256 code Bartlomiej Zolnierkiewicz
2009-10-21 20:45 ` [PATCH 12/12] Staging: rt28x0: remove dead code Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091021204412.4593.80397.sendpatchset@localhost.localdomain \
--to=bzolnier@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.