aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-11-26 10:56:13 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-12-07 16:50:13 -0500
commitc14589eb3080636a2f71ebaf21ab9fd70ffc20cc (patch)
tree073d16538a417b799bf70fa20a9f726145011f6d /drivers
parentwl1251: fix bssid handling (diff)
downloadlinux-dev-c14589eb3080636a2f71ebaf21ab9fd70ffc20cc.tar.xz
linux-dev-c14589eb3080636a2f71ebaf21ab9fd70ffc20cc.zip
wl1251: don't build null data template in wl1251_op_config()
The bssid can be zero when null data template is set in wl1251_op_config(). It's enough, and especially safe, to set it once after association. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 50d17fc00785..2f50a256efa5 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -629,10 +629,6 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
goto out_sleep;
}
- ret = wl1251_build_null_data(wl);
- if (ret < 0)
- goto out_sleep;
-
if (conf->flags & IEEE80211_CONF_PS && !wl->psm_requested) {
wl1251_debug(DEBUG_PSM, "psm enabled");