summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2010-08-04 03:46:22 +0300
committerLuciano Coelho <luciano.coelho@nokia.com>2010-09-28 12:15:05 +0300
commit5924f89d6597cd7ba014128ded64b2c7450c369c (patch)
tree513865ccf6d0fdae9032e639ac4cee997321c5b0 /drivers
parent76a029fbfb18c42f75c891842df26605ef87add0 (diff)
downloadop-kernel-dev-5924f89d6597cd7ba014128ded64b2c7450c369c.zip
op-kernel-dev-5924f89d6597cd7ba014128ded64b2c7450c369c.tar.gz
wl1271: remove useless 11a check when scanning
This code was a leftover of the previous scanning mechanism. The if is totally unnecessary, since both branches do the same thing. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 02ad6c6..b42ee48 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1624,10 +1624,7 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
if (ret < 0)
goto out;
- if (wl1271_11a_enabled())
- ret = wl1271_scan(hw->priv, ssid, len, req);
- else
- ret = wl1271_scan(hw->priv, ssid, len, req);
+ ret = wl1271_scan(hw->priv, ssid, len, req);
wl1271_ps_elp_sleep(wl);
OpenPOWER on IntegriCloud