iwlwifi: mvm: remove assignment of the reciprocal (8ea20d95) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/fw/api/mac.h

+10 −17

Original line number	Diff line number	Diff line
		@@ -151,9 +151,9 @@ enum iwl_tsf_id {
		* @beacon_time: beacon transmit time in system time
		* @beacon_tsf: beacon transmit time in TSF
		* @bi: beacon interval in TU
		* @bi_reciprocal: 2^32 / bi
		* @reserved1: reserved
		* @dtim_interval: dtim transmit time in TU
		* @dtim_reciprocal: 2^32 / dtim_interval
		* @reserved2: reserved
		* @mcast_qid: queue ID for multicast traffic.
		* NOTE: obsolete from VER2 and on
		* @beacon_template: beacon template ID
		@@ -162,9 +162,9 @@ struct iwl_mac_data_ap {
		__le32 beacon_time;
		__le64 beacon_tsf;
		__le32 bi;
		__le32 bi_reciprocal;
		__le32 reserved1;
		__le32 dtim_interval;
		__le32 dtim_reciprocal;
		__le32 reserved2;
		__le32 mcast_qid;
		__le32 beacon_template;
		} __packed; /* AP_MAC_DATA_API_S_VER_2 */
		@@ -174,14 +174,14 @@ struct iwl_mac_data_ap {
		* @beacon_time: beacon transmit time in system time
		* @beacon_tsf: beacon transmit time in TSF
		* @bi: beacon interval in TU
		* @bi_reciprocal: 2^32 / bi
		* @reserved: reserved
		* @beacon_template: beacon template ID
		*/
		struct iwl_mac_data_ibss {
		__le32 beacon_time;
		__le64 beacon_tsf;
		__le32 bi;
		__le32 bi_reciprocal;
		__le32 reserved;
		__le32 beacon_template;
		} __packed; /* IBSS_MAC_DATA_API_S_VER_1 */

		@@ -191,9 +191,9 @@ struct iwl_mac_data_ibss {
		* @dtim_time: DTIM arrival time in system time
		* @dtim_tsf: DTIM arrival time in TSF
		* @bi: beacon interval in TU, applicable only when associated
		* @bi_reciprocal: 2^32 / bi , applicable only when associated
		* @reserved1: reserved
		* @dtim_interval: DTIM interval in TU, applicable only when associated
		* @dtim_reciprocal: 2^32 / dtim_interval , applicable only when associated
		* @reserved2: reserved
		* @listen_interval: in beacon intervals, applicable only when associated
		* @assoc_id: unique ID assigned by the AP during association
		* @assoc_beacon_arrive_time: TSF of first beacon after association
		@@ -203,9 +203,9 @@ struct iwl_mac_data_sta {
		__le32 dtim_time;
		__le64 dtim_tsf;
		__le32 bi;
		__le32 bi_reciprocal;
		__le32 reserved1;
		__le32 dtim_interval;
		__le32 dtim_reciprocal;
		__le32 reserved2;
		__le32 listen_interval;
		__le32 assoc_id;
		__le32 assoc_beacon_arrive_time;
		@@ -378,13 +378,6 @@ struct iwl_mac_ctx_cmd {
		};
		} __packed; /* MAC_CONTEXT_CMD_API_S_VER_1 */

		static inline u32 iwl_mvm_reciprocal(u32 v)
		{
		if (!v)
		return 0;
		return 0xFFFFFFFF / v;
		}

		#define IWL_NONQOS_SEQ_GET 0x1
		#define IWL_NONQOS_SEQ_SET 0x2
		struct iwl_nonqos_seq_query_cmd {

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -767,13 +767,8 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
		}

		ctxt_sta->bi = cpu_to_le32(vif->bss_conf.beacon_int);
		ctxt_sta->bi_reciprocal =
		cpu_to_le32(iwl_mvm_reciprocal(vif->bss_conf.beacon_int));
		ctxt_sta->dtim_interval = cpu_to_le32(vif->bss_conf.beacon_int *
		vif->bss_conf.dtim_period);
		ctxt_sta->dtim_reciprocal =
		cpu_to_le32(iwl_mvm_reciprocal(vif->bss_conf.beacon_int *
		vif->bss_conf.dtim_period));

		ctxt_sta->listen_interval = cpu_to_le32(mvm->hw->conf.listen_interval);
		ctxt_sta->assoc_id = cpu_to_le32(vif->bss_conf.aid);
		@@ -832,8 +827,6 @@ static int iwl_mvm_mac_ctxt_cmd_ibss(struct iwl_mvm *mvm,

		/* cmd.ibss.beacon_time/cmd.ibss.beacon_tsf are curently ignored */
		cmd.ibss.bi = cpu_to_le32(vif->bss_conf.beacon_int);
		cmd.ibss.bi_reciprocal =
		cpu_to_le32(iwl_mvm_reciprocal(vif->bss_conf.beacon_int));

		/* TODO: Assumes that the beacon id == mac context id */
		cmd.ibss.beacon_template = cpu_to_le32(mvmvif->id);
		@@ -1180,13 +1173,8 @@ static void iwl_mvm_mac_ctxt_cmd_fill_ap(struct iwl_mvm *mvm,
		}

		ctxt_ap->bi = cpu_to_le32(vif->bss_conf.beacon_int);
		ctxt_ap->bi_reciprocal =
		cpu_to_le32(iwl_mvm_reciprocal(vif->bss_conf.beacon_int));
		ctxt_ap->dtim_interval = cpu_to_le32(vif->bss_conf.beacon_int *
		vif->bss_conf.dtim_period);
		ctxt_ap->dtim_reciprocal =
		cpu_to_le32(iwl_mvm_reciprocal(vif->bss_conf.beacon_int *
		vif->bss_conf.dtim_period));

		if (!fw_has_api(&mvm->fw->ucode_capa,
		IWL_UCODE_TLV_API_STA_TYPE))

Admin message