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

Commit d21844c7 authored May 10, 2011 by John W. Linville

Merge branch 'wireless-next-2.6' of...

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

parents e4eefec7 2c46f72e

drivers/net/wireless/iwlwifi/Kconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -102,6 +102,16 @@ config IWLWIFI_DEVICE_TRACING
	occur.		occur.
	endmenu		endmenu

			config IWLWIFI_DEVICE_SVTOOL
			bool "iwlwifi device svtool support"
			depends on IWLAGN
			select NL80211_TESTMODE
			help
			This option enables the svtool support for iwlwifi device through
			NL80211_TESTMODE. svtool is a software validation tool that runs in
			the user space and interacts with the device in the kernel space
			through the generic netlink message via NL80211_TESTMODE channel.

	config IWL_P2P		config IWL_P2P
	bool "iwlwifi experimental P2P support"		bool "iwlwifi experimental P2P support"
	depends on IWLAGN		depends on IWLAGN

drivers/net/wireless/iwlwifi/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@ iwlagn-objs += iwl-2000.o

	iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o		iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
	iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o		iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
			iwlagn-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-sv-open.o

	CFLAGS_iwl-devtrace.o := -I$(src)		CFLAGS_iwl-devtrace.o := -I$(src)

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -171,8 +171,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)

	static struct iwl_lib_ops iwl1000_lib = {		static struct iwl_lib_ops iwl1000_lib = {
	.set_hw_params = iwl1000_hw_set_hw_params,		.set_hw_params = iwl1000_hw_set_hw_params,
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
	.txq_set_sched = iwlagn_txq_set_sched,		.txq_set_sched = iwlagn_txq_set_sched,
	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,		.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
	.txq_free_tfd = iwl_hw_txq_free_tfd,		.txq_free_tfd = iwl_hw_txq_free_tfd,

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -252,8 +252,6 @@ static int iwl2030_hw_channel_switch(struct iwl_priv *priv,

	static struct iwl_lib_ops iwl2000_lib = {		static struct iwl_lib_ops iwl2000_lib = {
	.set_hw_params = iwl2000_hw_set_hw_params,		.set_hw_params = iwl2000_hw_set_hw_params,
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
	.txq_set_sched = iwlagn_txq_set_sched,		.txq_set_sched = iwlagn_txq_set_sched,
	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,		.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
	.txq_free_tfd = iwl_hw_txq_free_tfd,		.txq_free_tfd = iwl_hw_txq_free_tfd,

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -339,8 +339,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,

	static struct iwl_lib_ops iwl5000_lib = {		static struct iwl_lib_ops iwl5000_lib = {
	.set_hw_params = iwl5000_hw_set_hw_params,		.set_hw_params = iwl5000_hw_set_hw_params,
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
	.txq_set_sched = iwlagn_txq_set_sched,		.txq_set_sched = iwlagn_txq_set_sched,
	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,		.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
	.txq_free_tfd = iwl_hw_txq_free_tfd,		.txq_free_tfd = iwl_hw_txq_free_tfd,
	@@ -376,8 +374,6 @@ static struct iwl_lib_ops iwl5000_lib = {

	static struct iwl_lib_ops iwl5150_lib = {		static struct iwl_lib_ops iwl5150_lib = {
	.set_hw_params = iwl5150_hw_set_hw_params,		.set_hw_params = iwl5150_hw_set_hw_params,
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
	.txq_set_sched = iwlagn_txq_set_sched,		.txq_set_sched = iwlagn_txq_set_sched,
	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,		.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
	.txq_free_tfd = iwl_hw_txq_free_tfd,		.txq_free_tfd = iwl_hw_txq_free_tfd,