From: Kalle Valo <kalle.valo@nokia.com>
Date: Thu, 26 Nov 2009 08:56:13 +0000 (+0200)
Subject: wl1251: don't build null data template in wl1251_op_config()
X-Git-Tag: v2.6.33-rc1~299^2~44^2~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c14589eb3080636a2f71ebaf21ab9fd70ffc20cc;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 50d17fc0078..2f50a256efa 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");