Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27aaba0c authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: compile iwl-sta into iwlcore 



This patch moves iwl-sta into iwl-core.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1053d35f

drivers/net/wireless/iwlwifi/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_IWLCORE)	+= iwlcore.o

iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

iwlcore-objs 		+= iwl-rx.o iwl-tx.o

iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o

iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o
@@ -11,7 +11,7 @@ iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o 
iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o



obj-$(CONFIG_IWL4965)	+= iwl4965.o

iwl4965-objs		:= iwl4965-base.o iwl-4965.o iwl-4965-rs.o iwl-sta.o

iwl4965-objs		:= iwl4965-base.o iwl-4965.o iwl-4965-rs.o



ifeq ($(CONFIG_IWL5000),y)

	iwl4965-objs += iwl-5000.o

drivers/net/wireless/iwlwifi/iwl-sta.c

+5 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, u8 send_if_empty) 
	else

		return 0;

}

EXPORT_SYMBOL(iwl_send_static_wepkey_cmd);



int iwl_remove_default_wep_key(struct iwl_priv *priv,

			       struct ieee80211_key_conf *keyconf)
@@ -190,6 +191,7 @@ int iwl_remove_default_wep_key(struct iwl_priv *priv, 


	return ret;

}

EXPORT_SYMBOL(iwl_remove_default_wep_key);



int iwl_set_default_wep_key(struct iwl_priv *priv,

			    struct ieee80211_key_conf *keyconf)
@@ -217,6 +219,7 @@ int iwl_set_default_wep_key(struct iwl_priv *priv, 


	return ret;

}

EXPORT_SYMBOL(iwl_set_default_wep_key);



static int iwl_set_wep_dynamic_key_info(struct iwl_priv *priv,

				struct ieee80211_key_conf *keyconf,
@@ -391,6 +394,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, 
	spin_unlock_irqrestore(&priv->sta_lock, flags);

	return ret;

}

EXPORT_SYMBOL(iwl_remove_dynamic_key);



int iwl_set_dynamic_key(struct iwl_priv *priv,

				struct ieee80211_key_conf *key, u8 sta_id)
@@ -416,6 +420,7 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, 


	return ret;

}

EXPORT_SYMBOL(iwl_set_dynamic_key);



#ifdef CONFIG_IWLWIFI_DEBUG

static void iwl_dump_lq_cmd(struct iwl_priv *priv,