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

Commit b90a1685 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-06-28' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

More iwlwifi patches for 4.13

* Some changes in suspend/resume handling to support new FWs;
* A bunch of RF-kill related fixes;
* Continued work towards the A000 family;
* Support for a new version of the TX flush FW API;
* Some fixes in monitor interfaces;
* A few fixes in the recovery flows;
* Johannes' documentation fixes and FW API struct cleanups continue;
* Remove some noise from the kernel logs;
* Some other small improvements, fixes and cleanups;
parents 57c00f2f 6d759b02

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1513,7 +1513,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
out_free_eeprom_blob:

out_free_eeprom_blob:

	kfree(priv->eeprom_blob);

	kfree(priv->eeprom_blob);

out_free_eeprom:

out_free_eeprom:

	iwl_free_nvm_data(priv->nvm_data);

	kfree(priv->nvm_data);

out_free_hw:

out_free_hw:

	ieee80211_free_hw(priv->hw);

	ieee80211_free_hw(priv->hw);

out:

out:
@@ -1532,7 +1532,7 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) 
	iwl_tt_exit(priv);

	iwl_tt_exit(priv);





	kfree(priv->eeprom_blob);

	kfree(priv->eeprom_blob);

	iwl_free_nvm_data(priv->nvm_data);

	kfree(priv->nvm_data);





	/*netif_stop_queue(dev); */

	/*netif_stop_queue(dev); */

	flush_workqueue(priv->workqueue);

	flush_workqueue(priv->workqueue);

drivers/net/wireless/intel/iwlwifi/iwl-a000.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ 




#define IWL_A000_JF_FW_PRE	"iwlwifi-Qu-a0-jf-b0-"

#define IWL_A000_JF_FW_PRE	"iwlwifi-Qu-a0-jf-b0-"

#define IWL_A000_HR_FW_PRE	"iwlwifi-Qu-a0-hr-a0-"

#define IWL_A000_HR_FW_PRE	"iwlwifi-Qu-a0-hr-a0-"

#define IWL_A000_HR_CDB_FW_PRE	"iwlwifi-QuIcp-a0-hrcdb-a0-"

#define IWL_A000_HR_CDB_FW_PRE	"iwlwifi-QuIcp-z0-hrcdb-a0-"





#define IWL_A000_HR_MODULE_FIRMWARE(api) \

#define IWL_A000_HR_MODULE_FIRMWARE(api) \

	IWL_A000_HR_FW_PRE "-" __stringify(api) ".ucode"

	IWL_A000_HR_FW_PRE "-" __stringify(api) ".ucode"

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,7 @@ enum iwl_led_mode { 




/* Antenna presence definitions */

/* Antenna presence definitions */

#define	ANT_NONE	0x0

#define	ANT_NONE	0x0

#define	ANT_INVALID	0xff

#define	ANT_A		BIT(0)

#define	ANT_A		BIT(0)

#define	ANT_B		BIT(1)

#define	ANT_B		BIT(1)

#define ANT_C		BIT(2)

#define ANT_C		BIT(2)

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -153,6 +153,10 @@ 
/* GIO Chicken Bits (PCI Express bus link power management) */

/* GIO Chicken Bits (PCI Express bus link power management) */

#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)

#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)





/* host chicken bits */

#define CSR_HOST_CHICKEN	(CSR_BASE + 0x204)

#define CSR_HOST_CHICKEN_PM_IDLE_SRC_DIS_SB_PME	BIT(19)



/* Analog phase-lock-loop configuration  */

/* Analog phase-lock-loop configuration  */

#define CSR_ANA_PLL_CFG         (CSR_BASE+0x20c)

#define CSR_ANA_PLL_CFG         (CSR_BASE+0x20c)

drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h

+6 −5
Original line number Original line Diff line number Diff line
@@ -35,19 +35,20 @@ 




TRACE_EVENT(iwlwifi_dev_tx_data,

TRACE_EVENT(iwlwifi_dev_tx_data,

	TP_PROTO(const struct device *dev,

	TP_PROTO(const struct device *dev,

		 struct sk_buff *skb,

		 struct sk_buff *skb, u8 hdr_len),

		 u8 hdr_len, size_t data_len),

	TP_ARGS(dev, skb, hdr_len),

	TP_ARGS(dev, skb, hdr_len, data_len),

	TP_STRUCT__entry(

	TP_STRUCT__entry(

		DEV_ENTRY

		DEV_ENTRY





		__dynamic_array(u8, data, iwl_trace_data(skb) ? data_len : 0)

		__dynamic_array(u8, data,

				iwl_trace_data(skb) ? skb->len - hdr_len : 0)

	),

	),

	TP_fast_assign(

	TP_fast_assign(

		DEV_ASSIGN;

		DEV_ASSIGN;

		if (iwl_trace_data(skb))

		if (iwl_trace_data(skb))

			skb_copy_bits(skb, hdr_len,

			skb_copy_bits(skb, hdr_len,

				      __get_dynamic_array(data), data_len);

				      __get_dynamic_array(data),

				      skb->len - hdr_len);

	),

	),

	TP_printk("[%s] TX frame data", __get_str(dev))

	TP_printk("[%s] TX frame data", __get_str(dev))

);

);