libertas: remove unused 11d code
Most of the 11d code was protected with an "if (priv->enable11d)" clause. But there was no code that anywhere that was able to set this variable to true. So all 11d code was dead for almost a year and no one complained. That's enought incentive to remove this code. Besides removing old cruft, we gain back the 11d capability in a common way when we merge the cfg80211 functionality. 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>
This commit is contained in:

committed by
John W. Linville

parent
7f4013f096
commit
d37b4fdd43
@@ -161,31 +161,15 @@ static int lbs_scan_create_channel_list(struct lbs_private *priv,
|
||||
scantype = CMD_SCAN_TYPE_ACTIVE;
|
||||
|
||||
for (rgnidx = 0; rgnidx < ARRAY_SIZE(priv->region_channel); rgnidx++) {
|
||||
if (priv->enable11d && (priv->connect_status != LBS_CONNECTED)
|
||||
&& (priv->mesh_connect_status != LBS_CONNECTED)) {
|
||||
/* Scan all the supported chan for the first scan */
|
||||
if (!priv->universal_channel[rgnidx].valid)
|
||||
continue;
|
||||
scanregion = &priv->universal_channel[rgnidx];
|
||||
|
||||
/* clear the parsed_region_chan for the first scan */
|
||||
memset(&priv->parsed_region_chan, 0x00,
|
||||
sizeof(priv->parsed_region_chan));
|
||||
} else {
|
||||
if (!priv->region_channel[rgnidx].valid)
|
||||
continue;
|
||||
scanregion = &priv->region_channel[rgnidx];
|
||||
}
|
||||
if (!priv->region_channel[rgnidx].valid)
|
||||
continue;
|
||||
scanregion = &priv->region_channel[rgnidx];
|
||||
|
||||
for (nextchan = 0; nextchan < scanregion->nrcfp; nextchan++, chanidx++) {
|
||||
struct chanscanparamset *chan = &scanchanlist[chanidx];
|
||||
|
||||
cfp = scanregion->CFP + nextchan;
|
||||
|
||||
if (priv->enable11d)
|
||||
scantype = lbs_get_scan_type_11d(cfp->channel,
|
||||
&priv->parsed_region_chan);
|
||||
|
||||
if (scanregion->band == BAND_B || scanregion->band == BAND_G)
|
||||
chan->radiotype = CMD_SCAN_RADIO_TYPE_BG;
|
||||
|
||||
|
Reference in New Issue
Block a user