lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libertas: remove bss_descriptior->networktsf

Browse Source 
This value was parsed out, but then nowhere used ... except in
some debugfs output. I can't imagine anyone wanting to use this
value for anything real (as no other driver exports it), so
bye-bye.

Along this, made the columns of
/sys/kernel/debug/libertas_wireless/*/getscantable align again.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Holger Schurig
2007-08-02 13:12:45 -04:00
committed by David S. Miller
parent 4f2fdaaf0e
commit a2235ed402
3 changed files with 5 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/net/wireless/libertas/scan.c
View File

@@ -836,58 +836,6 @@ out:
return ret;
}
/**
* @brief Inspect the scan response buffer for pointers to expected TLVs
*
* TLVs can be included at the end of the scan response BSS information.
* Parse the data in the buffer for pointers to TLVs that can potentially
* be passed back in the response
*
* @param ptlv Pointer to the start of the TLV buffer to parse
* @param tlvbufsize size of the TLV buffer
* @param ptsftlv Output parameter: Pointer to the TSF TLV if found
*
* @return void
*/
static
void wlan_ret_802_11_scan_get_tlv_ptrs(struct mrvlietypes_data * ptlv,
int tlvbufsize,
struct mrvlietypes_tsftimestamp ** ptsftlv)
{
struct mrvlietypes_data *pcurrenttlv;
int tlvbufleft;
u16 tlvtype;
u16 tlvlen;
pcurrenttlv = ptlv;
tlvbufleft = tlvbufsize;
*ptsftlv = NULL;
lbs_deb_scan("SCAN_RESP: tlvbufsize = %d\n", tlvbufsize);
lbs_deb_hex(LBS_DEB_SCAN, "SCAN_RESP: TLV Buf", (u8 *) ptlv, tlvbufsize);
while (tlvbufleft >= sizeof(struct mrvlietypesheader)) {
tlvtype = le16_to_cpu(pcurrenttlv->header.type);
tlvlen = le16_to_cpu(pcurrenttlv->header.len);
switch (tlvtype) {
case TLV_TYPE_TSFTIMESTAMP:
*ptsftlv = (struct mrvlietypes_tsftimestamp *) pcurrenttlv;
break;
default:
lbs_deb_scan("SCAN_RESP: Unhandled TLV = %d\n",
tlvtype);
/* Give up, this seems corrupted */
return;
} /* switch */
tlvbufleft -= (sizeof(ptlv->header) + tlvlen);
pcurrenttlv =
(struct mrvlietypes_data *) (pcurrenttlv->Data + tlvlen);
} /* while */
}
/**
* @brief Interpret a BSS scan response returned from the firmware
*
@@ -1684,8 +1632,6 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
{
wlan_adapter *adapter = priv->adapter;
struct cmd_ds_802_11_scan_rsp *pscan;
struct mrvlietypes_data *ptlv;
struct mrvlietypes_tsftimestamp *ptsftlv;
struct bss_descriptor * iter_bss;
struct bss_descriptor * safe;
u8 *pbssinfo;
@@ -1734,11 +1680,6 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
+ sizeof(pscan->nr_sets)
+ S_DS_GEN);
ptlv = (struct mrvlietypes_data *) (pscan->bssdesc_and_tlvbuffer + bytesleft);
/* Search the TLV buffer space in the scan response for any valid TLVs */
wlan_ret_802_11_scan_get_tlv_ptrs(ptlv, tlvbufsize, &ptsftlv);
/*
* Process each scan response returned (pscan->nr_sets). Save
* the information in the newbssentry and then insert into the
@@ -1791,16 +1732,6 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
new.bssid[0], new.bssid[1], new.bssid[2],
new.bssid[3], new.bssid[4], new.bssid[5]);
/*
* If the TSF TLV was appended to the scan results, save the
* this entries TSF value in the networktsf field. The
* networktsf is the firmware's TSF value at the time the
* beacon or probe response was received.
*/
if (ptsftlv) {
new.networktsf = le64_to_cpup(&ptsftlv->tsftable[idx]);
}
/* Copy the locally created newbssentry to the scan table */
memcpy(found, &new, offsetof(struct bss_descriptor, list));
}