From 1eef4c3220a0af7b87f25e145c44d7240aea92c2 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@nokia.com>
Date: Thu, 26 Nov 2009 10:56:13 +0200
Subject: [PATCH] --- yaml --- r: 175499 b: refs/heads/master c:
 c14589eb3080636a2f71ebaf21ab9fd70ffc20cc h: refs/heads/master i:   175497:
 981df3086c0f91d045b21c25afd8e8c464a38cdf   175495:
 33432788738d3d23d084a6b7c66f4fdcec652594 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1251_main.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7d364be226ae..60faf22e3302 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de8df1ea489d80106ea82d4a6323e83d376913fb
+refs/heads/master: c14589eb3080636a2f71ebaf21ab9fd70ffc20cc
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
index 50d17fc00785..2f50a256efa5 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/trunk/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");