libertas: remove lefovers from setusercan cleanup

Marcelo Tosatti mtosatti at redhat.unroutablecom
Mon Dec 11 15:18:31 EST 2006


Commit:     f3df41dde8e5532cc626500fb1792cf14616a143
Parent:     a8733d9e1827d412e74e40ce3e4a493a3a53b49d
commit f3df41dde8e5532cc626500fb1792cf14616a143
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Fri Dec 8 15:24:23 2006 -0200
Commit:     Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Fri Dec 8 15:24:23 2006 -0200

    libertas: remove lefovers from setusercan cleanup
    
    Subject says it all.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 drivers/net/wireless/libertas/wlan_scan.c |   33 -----------------------------
 drivers/net/wireless/libertas/wlan_scan.h |    2 --
 2 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/drivers/net/wireless/libertas/wlan_scan.c b/drivers/net/wireless/libertas/wlan_scan.c
index d820651..20e4059 100644
--- a/drivers/net/wireless/libertas/wlan_scan.c
+++ b/drivers/net/wireless/libertas/wlan_scan.c
@@ -1837,39 +1837,6 @@ #define RSSI_DIFF    ((u8)(PERFECT_RSSI 
 }
 
 /**
- *  @brief Private IOCTL entry to perform an app configured immediate scan
- *
- *  @param priv         A pointer to wlan_private structure
- *  @param wrq          A pointer to iwreq structure containing the
- *                      wlan_ioctl_user_scan_cfg requesting this scan
- *
- *  @return             0 if successful; IOCTL error code otherwise
- */
-int libertas_set_user_scan_ioctl(wlan_private * priv, struct iwreq *wrq)
-{
-	struct wlan_ioctl_user_scan_cfg scanReq;
-	int retcode;
-	union iwreq_data wrqu;
-
-	if (copy_from_user(&scanReq,
-			   wrq->u.data.pointer,
-			   min_t(size_t, wrq->u.data.length, sizeof(scanReq))) != 0) {
-		/* copy_from_user failed  */
-		dprintk(1, "SetUserScan: copy from user failed\n");
-		retcode = -EFAULT;
-
-	} else {
-		retcode = wlan_scan_networks(priv, &scanReq);
-
-		memset(&wrqu, 0x00, sizeof(union iwreq_data));
-		wireless_send_event(priv->wlan_dev.netdev, SIOCGIWSCAN, &wrqu,
-				    NULL);
-	}
-
-	return retcode;
-}
-
-/**
  *  @brief Prepare a scan command to be sent to the firmware
  *
  *  Use the wlan_scan_cmd_config sent to the command processing module in
diff --git a/drivers/net/wireless/libertas/wlan_scan.h b/drivers/net/wireless/libertas/wlan_scan.h
index 18e9cd3..7fd024d 100644
--- a/drivers/net/wireless/libertas/wlan_scan.h
+++ b/drivers/net/wireless/libertas/wlan_scan.h
@@ -220,8 +220,6 @@ extern int libertas_send_specific_SSID_s
 extern int libertas_send_specific_BSSID_scan(wlan_private * priv,
 				 u8 * bssid, u8 keepPreviousScan);
 
-extern int libertas_set_user_scan_ioctl(wlan_private * priv, struct iwreq *wrq);
-
 extern int libertas_cmd_80211_scan(wlan_private * priv,
 				struct HostCmd_DS_COMMAND *cmd,
 				void *pdata_buf);


More information about the Commits-kernel mailing list