aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/libertas/scan.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-11-28 17:29:36 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:04:57 -0800
commitdd1d12dabfeb123881b0c813d0b7d3585312bacd (patch)
treef7b9d23da8393d34a46400f7ffb36cde6bce8ce6 /drivers/net/wireless/libertas/scan.c
parent01affb653077d8581552d566276b405237636e5c (diff)
libertas: remove numprobes
Remove the ability to specify number of probes via debugfs Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
-rw-r--r--drivers/net/wireless/libertas/scan.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 4e465bb4fd6..de9c548cb6a 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -41,7 +41,6 @@
//! Maximum memory needed for a lbs_scan_cmd_config with all TLVs at max
#define MAX_SCAN_CFG_ALLOC (sizeof(struct lbs_scan_cmd_config) \
- + sizeof(struct mrvlietypes_numprobes) \
+ CHAN_TLV_MAX_SIZE \
+ SSID_TLV_MAX_SIZE)
@@ -385,7 +384,6 @@ void lbs_scan_worker(struct work_struct *work)
* - channel list
*
* If the SSID or BSSID filter is not present, disable/clear the filter.
- * If the number of probes is not set, use the adapter default setting
* Qualify the channel
*
* @param priv A pointer to struct lbs_private structure
@@ -415,11 +413,9 @@ lbs_scan_setup_scan_config(struct lbs_private *priv,
u8 * pfilteredscan,
u8 * pscancurrentonly)
{
- struct mrvlietypes_numprobes *pnumprobestlv;
struct mrvlietypes_ssidparamset *pssidtlv;
struct lbs_scan_cmd_config *pscancfgout = NULL;
u8 *ptlvpos;
- u16 numprobes;
int chanidx;
int scantype;
int scandur;
@@ -468,9 +464,6 @@ lbs_scan_setup_scan_config(struct lbs_private *priv,
pscancfgout->bsstype =
puserscanin->bsstype ? puserscanin->bsstype : CMD_BSS_TYPE_ANY;
- /* Set the number of probes to send, use adapter setting if unset */
- numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0;
-
/*
* Set the BSSID filter to the incoming configuration,
* if non-zero. If not set, it will remain disabled (all zeros).
@@ -502,22 +495,11 @@ lbs_scan_setup_scan_config(struct lbs_private *priv,
}
} else {
pscancfgout->bsstype = CMD_BSS_TYPE_ANY;
- numprobes = 0;
- }
-
- /* If the input config or adapter has the number of Probes set, add tlv */
- if (numprobes) {
- pnumprobestlv = (struct mrvlietypes_numprobes *) ptlvpos;
- pnumprobestlv->header.type = cpu_to_le16(TLV_TYPE_NUMPROBES);
- pnumprobestlv->header.len = cpu_to_le16(2);
- pnumprobestlv->numprobes = cpu_to_le16(numprobes);
-
- ptlvpos += sizeof(*pnumprobestlv);
}
/*
* Set the output for the channel TLV to the address in the tlv buffer
- * past any TLVs that were added in this fuction (SSID, numprobes).
+ * past any TLVs that were added in this fuction (SSID).
* channel TLVs will be added past this for each scan command, preserving
* the TLVs that were previously added.
*/