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

Merge tag 'iwlwifi-next-for-kalle-2020-06-11' of... 

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

First set of patches intended for v5.9

* Fix links to wiki;
* Some preparations for gcc-10;
* Make FW reconfiguration quieter by not using warn level;
* Some other small fixes and clean-up;

# gpg: Signature made Thu 11 Jun 2020 12:03:51 PM EEST using RSA key ID 1A3CC5FA
# gpg: Good signature from "Luciano Roth Coelho (Luca) <luca@coelho.fi>"
# gpg:                 aka "Luciano Roth Coelho (Intel) <luciano.coelho@intel.com>"
parents f5f58a0b e00c6d8d

drivers/net/wireless/intel/iwlegacy/4965-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ il4965_hdl_c_stats(struct il_priv *il, struct il_rx_buf *rxb) 
/*

 * mac80211 queues, ACs, hardware queues, FIFOs.

 *

 * Cf. http://wireless.kernel.org/en/developers/Documentation/mac80211/queues

 * Cf. https://wireless.wiki.kernel.org/en/developers/Documentation/mac80211/queues

 *

 * Mac80211 uses the following numbers, which we get as from it

 * by way of skb_get_queue_mapping(skb):

drivers/net/wireless/intel/iwlwifi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ config IWLWIFI 
	  In order to use this driver, you will need a firmware

	  image for it. You can obtain the microcode from:



	          <http://wireless.kernel.org/en/users/Drivers/iwlwifi>.

	          <https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi>.



	  The firmware is typically installed in /lib/firmware. You can

	  look in the hotplug script /etc/hotplug/firmware.agent to

drivers/net/wireless/intel/iwlwifi/dvm/commands.h

+6 −6
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ struct iwl_wep_cmd { 
	u8 global_key_type;

	u8 flags;

	u8 reserved;

	struct iwl_wep_key key[0];

	struct iwl_wep_key key[];

} __packed;



#define WEP_KEY_WEP_TYPE 1
@@ -1305,7 +1305,7 @@ struct iwl_tx_cmd { 
	 * length is 26 or 30 bytes, followed by payload data

	 */

	u8 payload[0];

	struct ieee80211_hdr hdr[0];

	struct ieee80211_hdr hdr[];

} __packed;



/*
@@ -2380,7 +2380,7 @@ struct iwl_scan_cmd { 
	 * for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)

	 * before requesting another scan.

	 */

	u8 data[0];

	u8 data[];

} __packed;



/* Can abort will notify by complete notification with abort status. */
@@ -2475,7 +2475,7 @@ struct iwl_tx_beacon_cmd { 
	__le16 tim_idx;

	u8 tim_size;

	u8 reserved1;

	struct ieee80211_hdr frame[0];	/* beacon frame */

	struct ieee80211_hdr frame[];	/* beacon frame */

} __packed;



/******************************************************************************
@@ -3188,7 +3188,7 @@ struct iwl_calib_hdr { 


struct iwl_calib_cmd {

	struct iwl_calib_hdr hdr;

	u8 data[0];

	u8 data[];

} __packed;



struct iwl_calib_xtal_freq_cmd {
@@ -3216,7 +3216,7 @@ struct iwl_calib_temperature_offset_v2_cmd { 
/* IWL_PHY_CALIBRATE_CHAIN_NOISE_RESET_CMD */

struct iwl_calib_chain_noise_reset_cmd {

	struct iwl_calib_hdr hdr;

	u8 data[0];

	u8 data[];

};



/* IWL_PHY_CALIBRATE_CHAIN_NOISE_GAIN_CMD */

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

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
	iwl_leds_init(priv);



	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);

	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_EXT_KEY_ID);



	ret = ieee80211_register_hw(priv->hw);

	if (ret) {

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ struct iwl_mcc_update_resp_v3 { 
	__le16 time;

	__le16 geo_info;

	__le32 n_channels;

	__le32 channels[0];

	__le32 channels[];

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_3 */



/**
@@ -390,7 +390,7 @@ struct iwl_mcc_update_resp { 
	u8 source_id;

	u8 reserved[3];

	__le32 n_channels;

	__le32 channels[0];

	__le32 channels[];

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_4 */



/**