From patchwork Tue Jul 28 16:58:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 37842 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 n6SGwxgK007247 for ; Tue, 28 Jul 2009 16:58:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881AbZG1Q65 (ORCPT ); Tue, 28 Jul 2009 12:58:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752862AbZG1Q65 (ORCPT ); Tue, 28 Jul 2009 12:58:57 -0400 Received: from mail-ew0-f226.google.com ([209.85.219.226]:40597 "EHLO mail-ew0-f226.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751186AbZG1Q64 (ORCPT ); Tue, 28 Jul 2009 12:58:56 -0400 Received: by ewy26 with SMTP id 26so186642ewy.37 for ; Tue, 28 Jul 2009 09:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:mime-version:content-type:content-transfer-encoding :content-disposition:message-id; bh=S4QVMb0nZwA8rDwKY2FqEDEo1EBry7IXWcIxeqVIlpE=; b=FyC0rd4sQsjs5YOAyfjFfIRJGBngdedg8uBZjq/BXFVkW6xNS8i34Gv2d+4dVyq8hw +tuJ20esfdMafFyBQTlWXWb0Tw4ID1RxxMGJZnqT4tAPxFSewnv9YKD2q0Ulq4ookX8+ wIvv2NlecrwWWY0GaSKAQzTqoaP5rqvO4aMRc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=JZJUbeIF7KJ1cJuOvHtAxXN5LyvIxjGCvbQZWlp4jgGGHif2OddyQAK/+VwxjnjHee ScUxGnHz99wzh0kKA+oraStQry6FLh5yKZFqrbnrnKPvVJaad4YRKTuFludHmg2N09lZ Da70V6yRKH26WhCdWgxCgQ3iDKjka5ELSK028= Received: by 10.216.3.196 with SMTP id 46mr2060574weh.205.1248800336161; Tue, 28 Jul 2009 09:58:56 -0700 (PDT) Received: from ?192.168.8.44? (k23246.upc-k.chello.nl [62.108.23.246]) by mx.google.com with ESMTPS id 5sm217787eyh.37.2009.07.28.09.58.55 (version=SSLv3 cipher=RC4-MD5); Tue, 28 Jul 2009 09:58:55 -0700 (PDT) From: Ivo van Doorn To: John Linville , Ken Lewis Subject: [PATCH] rt2x00: Fix build error when crypto support is disabled Date: Tue, 28 Jul 2009 18:58:54 +0200 User-Agent: KMail/1.9.10 Cc: users@host1.serialmonkey.com, linux-wireless@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200907281858.54519.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When only rt2400pci or rt2500pci is compiled without any of the other rt2x00 modules, then CONFIG_RT2X00_LIB_CRYPTO will not be enabled. However rt2x00mac_set_tim() implemented within #ifdef CONFIG_RT2X00_LIB_CRYPTO statements while the declaration is placed outside the definition. This results in linking errors as reporte by Ken. rt2x00_set_tim() has nothing to do with crypto, and thus should be moved outside of the #ifdef statements. Signed-off-by: Ivo van Doorn --- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 7de1a2c..e92c8f9 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -435,6 +435,16 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw, } EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter); +int rt2x00mac_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, + bool set) +{ + struct rt2x00_dev *rt2x00dev = hw->priv; + + rt2x00lib_beacondone(rt2x00dev); + return 0; +} +EXPORT_SYMBOL_GPL(rt2x00mac_set_tim); + #ifdef CONFIG_RT2X00_LIB_CRYPTO static void memcpy_tkip(struct rt2x00lib_crypto *crypto, u8 *key, u8 key_len) { @@ -454,16 +464,6 @@ static void memcpy_tkip(struct rt2x00lib_crypto *crypto, u8 *key, u8 key_len) sizeof(crypto->rx_mic)); } -int rt2x00mac_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, - bool set) -{ - struct rt2x00_dev *rt2x00dev = hw->priv; - - rt2x00lib_beacondone(rt2x00dev); - return 0; -} -EXPORT_SYMBOL_GPL(rt2x00mac_set_tim); - int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, struct ieee80211_vif *vif, struct ieee80211_sta *sta, struct ieee80211_key_conf *key)