Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (d91547c0) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,8 @@ enum {
		REPLY_DEBUG_CMD = 0xf0,
		DEBUG_LOG_MSG = 0xf7,

		MCAST_FILTER_CMD = 0xd0,

		/* D3 commands/notifications */
		D3_CONFIG_CMD = 0xd3,
		PROT_OFFLOAD_CONFIG_CMD = 0xd4,
		@@ -948,4 +950,29 @@ struct iwl_set_calib_default_cmd {
		u8 data[0];
		} __packed; /* PHY_CALIB_OVERRIDE_VALUES_S */

		#define MAX_PORT_ID_NUM 2

		/**
		* struct iwl_mcast_filter_cmd - configure multicast filter.
		* @filter_own: Set 1 to filter out multicast packets sent by station itself
		* @port_id: Multicast MAC addresses array specifier. This is a strange way
		* to identify network interface adopted in host-device IF.
		* It is used by FW as index in array of addresses. This array has
		* MAX_PORT_ID_NUM members.
		* @count: Number of MAC addresses in the array
		* @pass_all: Set 1 to pass all multicast packets.
		* @bssid: current association BSSID.
		* @addr_list: Place holder for array of MAC addresses.
		* IMPORTANT: add padding if necessary to ensure DWORD alignment.
		*/
		struct iwl_mcast_filter_cmd {
		u8 filter_own;
		u8 port_id;
		u8 count;
		u8 pass_all;
		u8 bssid[6];
		u8 reserved[2];
		u8 addr_list[0];
		} __packed; /* MCAST_FILTERING_CMD_API_S_VER_1 */

		#endif /* __fw_api_h__ */

+8 −4

Original line number	Diff line number	Diff line
		@@ -586,10 +586,12 @@ static int iwl_mvm_mac_ctxt_send_cmd(struct iwl_mvm *mvm,
		*/
		static void iwl_mvm_mac_ctxt_cmd_fill_sta(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif,
		struct iwl_mac_data_sta *ctxt_sta)
		struct iwl_mac_data_sta *ctxt_sta,
		bool force_assoc_off)
		{
		/* We need the dtim_period to set the MAC as associated */
		if (vif->bss_conf.assoc && vif->bss_conf.dtim_period) {
		if (vif->bss_conf.assoc && vif->bss_conf.dtim_period &&
		!force_assoc_off) {
		u32 dtim_offs;

		/*
		@@ -659,7 +661,8 @@ static int iwl_mvm_mac_ctxt_cmd_station(struct iwl_mvm *mvm,
		cmd.filter_flags &= ~cpu_to_le32(MAC_FILTER_IN_BEACON);

		/* Fill the data specific for station mode */
		iwl_mvm_mac_ctxt_cmd_fill_sta(mvm, vif, &cmd.sta);
		iwl_mvm_mac_ctxt_cmd_fill_sta(mvm, vif, &cmd.sta,
		action == FW_CTXT_ACTION_ADD);

		return iwl_mvm_mac_ctxt_send_cmd(mvm, &cmd);
		}
		@@ -677,7 +680,8 @@ static int iwl_mvm_mac_ctxt_cmd_p2p_client(struct iwl_mvm *mvm,
		iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);

		/* Fill the data specific for station mode */
		iwl_mvm_mac_ctxt_cmd_fill_sta(mvm, vif, &cmd.p2p_sta.sta);
		iwl_mvm_mac_ctxt_cmd_fill_sta(mvm, vif, &cmd.p2p_sta.sta,
		action == FW_CTXT_ACTION_ADD);

		cmd.p2p_sta.ctwin = cpu_to_le32(noa->oppps_ctwindow &
		IEEE80211_P2P_OPPPS_CTWINDOW_MASK);

+16 −1

Original line number	Diff line number	Diff line
		@@ -701,6 +701,20 @@ static void iwl_mvm_configure_filter(struct ieee80211_hw *hw,
		*total_flags = 0;
		}

		static int iwl_mvm_configure_mcast_filter(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif)
		{
		struct iwl_mcast_filter_cmd mcast_filter_cmd = {
		.pass_all = 1,
		};

		memcpy(mcast_filter_cmd.bssid, vif->bss_conf.bssid, ETH_ALEN);

		return iwl_mvm_send_cmd_pdu(mvm, MCAST_FILTER_CMD, CMD_SYNC,
		sizeof(mcast_filter_cmd),
		&mcast_filter_cmd);
		}

		static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif,
		struct ieee80211_bss_conf *bss_conf,
		@@ -722,6 +736,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
		return;
		}
		iwl_mvm_bt_coex_vif_assoc(mvm, vif);
		iwl_mvm_configure_mcast_filter(mvm, vif);
		} else if (mvmvif->ap_sta_id != IWL_MVM_STATION_COUNT) {
		/* remove AP station now that the MAC is unassoc */
		ret = iwl_mvm_rm_sta_id(mvm, vif, mvmvif->ap_sta_id);
		@@ -931,7 +946,7 @@ static void iwl_mvm_mac_sta_notify(struct ieee80211_hw *hw,

		switch (cmd) {
		case STA_NOTIFY_SLEEP:
		if (atomic_read(&mvmsta->pending_frames) > 0)
		if (atomic_read(&mvm->pending_frames[mvmsta->sta_id]) > 0)
		ieee80211_sta_block_awake(hw, sta, true);
		/*
		* The fw updates the STA to be asleep. Tx packets on the Tx

+1 −0

Original line number	Diff line number	Diff line
		@@ -292,6 +292,7 @@ struct iwl_mvm {
		struct ieee80211_sta __rcu *fw_id_to_mac_id[IWL_MVM_STATION_COUNT];
		struct work_struct sta_drained_wk;
		unsigned long sta_drained[BITS_TO_LONGS(IWL_MVM_STATION_COUNT)];
		atomic_t pending_frames[IWL_MVM_STATION_COUNT];

		/* configured by mac80211 */
		u32 rts_threshold;

+1 −0

Original line number	Diff line number	Diff line
		@@ -292,6 +292,7 @@ static const char *iwl_mvm_cmd_strings[REPLY_MAX] = {
		CMD(BT_COEX_PROT_ENV),
		CMD(BT_PROFILE_NOTIFICATION),
		CMD(BT_CONFIG),
		CMD(MCAST_FILTER_CMD),
		};
		#undef CMD