From patchwork Thu Nov 26 08:56:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 63100 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAQ93109025446 for ; Thu, 26 Nov 2009 09:03:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759968AbZKZJCw (ORCPT ); Thu, 26 Nov 2009 04:02:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760032AbZKZJCv (ORCPT ); Thu, 26 Nov 2009 04:02:51 -0500 Received: from smtp.nokia.com ([192.100.122.230]:58819 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759900AbZKZJCt (ORCPT ); Thu, 26 Nov 2009 04:02:49 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nAQ8uHb5028052; Thu, 26 Nov 2009 10:56:29 +0200 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 26 Nov 2009 10:56:17 +0200 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 26 Nov 2009 10:56:17 +0200 Received: from [127.0.1.1] (essapo-nirac253206.europe.nokia.com [10.162.253.206]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nAQ8uDGG030942; Thu, 26 Nov 2009 10:56:14 +0200 Subject: [PATCH 3/3] wl1251: don't build null data template in wl1251_op_config() To: linville@tuxdriver.com From: Kalle Valo Cc: linux-wireless@vger.kernel.org Date: Thu, 26 Nov 2009 10:56:13 +0200 Message-ID: <20091126085613.1564.36360.stgit@tikku> In-Reply-To: <20091126085256.1564.77644.stgit@tikku> References: <20091126085256.1564.77644.stgit@tikku> User-Agent: StGit/0.15 MIME-Version: 1.0 X-OriginalArrivalTime: 26 Nov 2009 08:56:17.0490 (UTC) FILETIME=[50D65320:01CA6E76] X-Nokia-AV: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 50d17fc..2f50a25 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");