rt2x00: Fix build error when crypto support is disabled
PATCH 1/1 rt2x00: Fix build error when crypto support is disabled
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 <[email protected]>
---
drivers/net/wireless/rt2x00/rt2x00mac.c +10 -10
@@ -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)