wl1251: don't build null data template in wl1251_op_config()
authorKalle Valo <kalle.valo@nokia.com>
Thu, 26 Nov 2009 08:56:13 +0000 (10:56 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Dec 2009 21:50:13 +0000 (16:50 -0500)
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>
drivers/net/wireless/wl12xx/wl1251_main.c

index 50d17fc007850b5c049ee91e584574e0936a6280..2f50a256efa5a00fa18b45e94ce9be3130f7628c 100644 (file)
@@ -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");