Merge branch 'wireless-next-2.6' of... (18d6a0f5) · Commits · e / devices / android_kernel_oneplus_sm7250

MAINTAINERS

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3355,6 +3355,16 @@ F: Documentation/wimax/README.i2400m
	F: drivers/net/wimax/i2400m/		F: drivers/net/wimax/i2400m/
	F: include/linux/wimax/i2400m.h		F: include/linux/wimax/i2400m.h

			INTEL PRO/WIRELESS 3945ABG/BG NETWORK CONNECTION SUPPORT
			L: linux-wireless@vger.kernel.org
			S: Orphan
			F: drivers/net/wireless/iwlegacy/

			INTEL WIRELESS WIFI 4965AGN NETWORK CONNECTION SUPPORT
			L: linux-wireless@vger.kernel.org
			S: Orphan
			F: drivers/net/wireless/iwlegacy/

	INTEL WIRELESS WIFI LINK (iwlwifi)		INTEL WIRELESS WIFI LINK (iwlwifi)
	M: Wey-Yi Guy <wey-yi.w.guy@intel.com>		M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
	M: Intel Linux Wireless <ilw@linux.intel.com>		M: Intel Linux Wireless <ilw@linux.intel.com>

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -179,8 +179,6 @@ static struct iwl_lib_ops iwl1000_lib = {
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,		.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_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_agg_enable = iwlagn_txq_agg_enable,
	.txq_agg_disable = iwlagn_txq_agg_disable,
	.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,
	.txq_init = iwl_hw_tx_queue_init,		.txq_init = iwl_hw_tx_queue_init,

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

+0 −33

Original line number	Original line	Diff line number	Diff line
	@@ -259,8 +259,6 @@ static struct iwl_lib_ops iwl2000_lib = {
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,		.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_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_agg_enable = iwlagn_txq_agg_enable,
	.txq_agg_disable = iwlagn_txq_agg_disable,
	.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,
	.txq_init = iwl_hw_tx_queue_init,		.txq_init = iwl_hw_tx_queue_init,
	@@ -471,37 +469,6 @@ struct iwl_cfg iwl2030_2bg_cfg = {
	IWL_DEVICE_2030,		IWL_DEVICE_2030,
	};		};

	#define IWL_DEVICE_6035 \
	.fw_name_pre = IWL2030_FW_PRE, \
	.ucode_api_max = IWL2030_UCODE_API_MAX, \
	.ucode_api_min = IWL2030_UCODE_API_MIN, \
	.eeprom_ver = EEPROM_6035_EEPROM_VERSION, \
	.eeprom_calib_ver = EEPROM_6035_TX_POWER_VERSION, \
	.ops = &iwl2030_ops, \
	.mod_params = &iwlagn_mod_params, \
	.base_params = &iwl2030_base_params, \
	.bt_params = &iwl2030_bt_params, \
	.need_dc_calib = true, \
	.need_temp_offset_calib = true, \
	.led_mode = IWL_LED_RF_STATE, \
	.adv_pm = true \

	struct iwl_cfg iwl6035_2agn_cfg = {
	.name = "2000 Series 2x2 AGN/BT",
	IWL_DEVICE_6035,
	.ht_params = &iwl2000_ht_params,
	};

	struct iwl_cfg iwl6035_2abg_cfg = {
	.name = "2000 Series 2x2 ABG/BT",
	IWL_DEVICE_6035,
	};

	struct iwl_cfg iwl6035_2bg_cfg = {
	.name = "2000 Series 2x2 BG/BT",
	IWL_DEVICE_6035,
	};

	#define IWL_DEVICE_200 \		#define IWL_DEVICE_200 \
	.fw_name_pre = IWL200_FW_PRE, \		.fw_name_pre = IWL200_FW_PRE, \
	.ucode_api_max = IWL200_UCODE_API_MAX, \		.ucode_api_max = IWL200_UCODE_API_MAX, \

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

+0 −4

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

+16 −4

Original line number	Original line	Diff line number	Diff line
	@@ -288,8 +288,6 @@ static struct iwl_lib_ops iwl6000_lib = {
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,		.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_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_agg_enable = iwlagn_txq_agg_enable,
	.txq_agg_disable = iwlagn_txq_agg_disable,
	.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,
	.txq_init = iwl_hw_tx_queue_init,		.txq_init = iwl_hw_tx_queue_init,
	@@ -357,8 +355,6 @@ static struct iwl_lib_ops iwl6030_lib = {
	.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,		.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
	.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_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_agg_enable = iwlagn_txq_agg_enable,
	.txq_agg_disable = iwlagn_txq_agg_disable,
	.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,
	.txq_init = iwl_hw_tx_queue_init,		.txq_init = iwl_hw_tx_queue_init,
	@@ -613,6 +609,22 @@ struct iwl_cfg iwl6030_2bg_cfg = {
	IWL_DEVICE_6030,		IWL_DEVICE_6030,
	};		};

			struct iwl_cfg iwl6035_2agn_cfg = {
			.name = "6035 Series 2x2 AGN/BT",
			IWL_DEVICE_6030,
			.ht_params = &iwl6000_ht_params,
			};

			struct iwl_cfg iwl6035_2abg_cfg = {
			.name = "6035 Series 2x2 ABG/BT",
			IWL_DEVICE_6030,
			};

			struct iwl_cfg iwl6035_2bg_cfg = {
			.name = "6035 Series 2x2 BG/BT",
			IWL_DEVICE_6030,
			};

	struct iwl_cfg iwl1030_bgn_cfg = {		struct iwl_cfg iwl1030_bgn_cfg = {
	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",		.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
	IWL_DEVICE_6030,		IWL_DEVICE_6030,