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

Commit 24de851b authored by John W. Linville's avatar John W. Linville
Browse files

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

parents d0746663 89716344

drivers/net/wireless/iwlwifi/Kconfig

+7 −6
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ config IWLWIFI 
		Intel Wireless WiFi Link 6150BGN 2 Adapter

		Intel 100 Series Wi-Fi Adapters (100BGN and 130BGN)

		Intel 2000 Series Wi-Fi Adapters

		Intel 7260 Wi-Fi Adapter

		Intel 3160 Wi-Fi Adapter





	  This driver uses the kernel's mac80211 subsystem.
@@ -46,17 +48,16 @@ config IWLDVM 
	depends on IWLWIFI

	default IWLWIFI

	help

	  This is the driver supporting the DVM firmware which is

	  currently the only firmware available for existing devices.

	  This is the driver that supports the DVM firmware which is

	  used by most existing devices (with the exception of 7260

	  and 3160).



config IWLMVM

	tristate "Intel Wireless WiFi MVM Firmware support"

	depends on IWLWIFI

	help

	  This is the driver supporting the MVM firmware which is

	  currently only available for 7000 series devices.



	  Say yes if you have such a device.

	  This is the driver that supports the MVM firmware which is

	  currently only available for 7260 and 3160 devices.



# don't call it _MODULE -- will confuse Kconfig/fixdep/...

config IWLWIFI_OPMODE_MODULAR

drivers/net/wireless/iwlwifi/iwl-debug.h

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ do { \ 
#define IWL_DL_RX		0x01000000

#define IWL_DL_ISR		0x02000000

#define IWL_DL_HT		0x04000000

#define IWL_DL_EXTERNAL		0x08000000

/* 0xF0000000 - 0x10000000 */

#define IWL_DL_11H		0x10000000

#define IWL_DL_STATS		0x20000000
@@ -153,6 +154,7 @@ do { \ 


#define IWL_DEBUG_INFO(p, f, a...)	IWL_DEBUG(p, IWL_DL_INFO, f, ## a)

#define IWL_DEBUG_MAC80211(p, f, a...)	IWL_DEBUG(p, IWL_DL_MAC80211, f, ## a)

#define IWL_DEBUG_EXTERNAL(p, f, a...)	IWL_DEBUG(p, IWL_DL_EXTERNAL, f, ## a)

#define IWL_DEBUG_TEMP(p, f, a...)	IWL_DEBUG(p, IWL_DL_TEMP, f, ## a)

#define IWL_DEBUG_SCAN(p, f, a...)	IWL_DEBUG(p, IWL_DL_SCAN, f, ## a)

#define IWL_DEBUG_RX(p, f, a...)	IWL_DEBUG(p, IWL_DL_RX, f, ## a)

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

+6 −4
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	int i;

	bool load_module = false;



	fw->ucode_capa.max_probe_length = 200;

	fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;

	fw->ucode_capa.standard_phy_calibration_size =

			IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;
@@ -1032,8 +1032,10 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, 
	int ret;



	drv = kzalloc(sizeof(*drv), GFP_KERNEL);

	if (!drv)

		return NULL;

	if (!drv) {

		ret = -ENOMEM;

		goto err;

	}



	drv->trans = trans;

	drv->dev = trans->dev;
@@ -1078,7 +1080,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans, 
err_free_drv:

#endif

	kfree(drv);



err:

	return ERR_PTR(ret);

}

drivers/net/wireless/iwlwifi/iwl-fw.h

+5 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
 * @IWL_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS

 * @IWL_UCODE_TLV_FLAGS_UAPSD: This uCode image supports uAPSD

 * @IWL_UCODE_TLV_FLAGS_RX_ENERGY_API: supports rx signal strength api

 * @IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2: using the new time event API.

 * @IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS: D3 image supports up to six

 *	(rather than two) IPv6 addresses

 * @IWL_UCODE_TLV_FLAGS_BF_UPDATED: new beacon filtering API
@@ -88,6 +89,7 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_DW_BC_TABLE		= BIT(4),

	IWL_UCODE_TLV_FLAGS_UAPSD		= BIT(6),

	IWL_UCODE_TLV_FLAGS_RX_ENERGY_API	= BIT(8),

	IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2	= BIT(9),

	IWL_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS	= BIT(10),

	IWL_UCODE_TLV_FLAGS_BF_UPDATED		= BIT(11),

};
@@ -97,6 +99,9 @@ enum iwl_ucode_tlv_flag { 
#define IWL_MAX_STANDARD_PHY_CALIBRATE_TBL_SIZE		19

#define IWL_MAX_PHY_CALIBRATE_TBL_SIZE			253



/* The default max probe length if not specified by the firmware file */

#define IWL_DEFAULT_MAX_PROBE_LENGTH	200



/**

 * enum iwl_ucode_type

 *

drivers/net/wireless/iwlwifi/mvm/constants.h

+9 −0
Original line number Diff line number Diff line
@@ -67,5 +67,14 @@ 
#define IWL_MVM_DEFAULT_PS_RX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)

#define IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)

#define IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_RX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_TX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)

#define IWL_MVM_PS_HEAVY_TX_THLD_PACKETS	20

#define IWL_MVM_PS_HEAVY_RX_THLD_PACKETS	20

#define IWL_MVM_PS_HEAVY_TX_THLD_PERCENT	50

#define IWL_MVM_PS_HEAVY_RX_THLD_PERCENT	50

#define IWL_MVM_PS_SNOOZE_INTERVAL		25

#define IWL_MVM_PS_SNOOZE_WINDOW		50

#define IWL_MVM_WOWLAN_PS_SNOOZE_WINDOW		25



#endif /* __MVM_CONSTANTS_H */