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

Commit 0416841d authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: remove command/return value from RX handlers 



In the mvm driver, neither the old command nor the return value
are used, so remove them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 73e686f3

drivers/net/wireless/iwlwifi/mvm/coex.c

+22 −22
Original line number Diff line number Diff line
@@ -725,15 +725,17 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm) 
	}

}



int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb,

			     struct iwl_device_cmd *dev_cmd)

void iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,

			      struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_bt_coex_profile_notif *notif = (void *)pkt->data;



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

		return iwl_mvm_rx_bt_coex_notif_old(mvm, rxb, dev_cmd);

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

			IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {

		iwl_mvm_rx_bt_coex_notif_old(mvm, rxb);

		return;

	}



	IWL_DEBUG_COEX(mvm, "BT Coex Notification received\n");

	IWL_DEBUG_COEX(mvm, "\tBT ci compliance %d\n", notif->bt_ci_compliance);
@@ -748,12 +750,6 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm, 
	memcpy(&mvm->last_bt_notif, notif, sizeof(mvm->last_bt_notif));



	iwl_mvm_bt_coex_notif_handle(mvm);



	/*

	 * This is an async handler for a notification, returning anything other

	 * than 0 doesn't make sense even if HCMD failed.

	 */

	return 0;

}



void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
@@ -947,9 +943,8 @@ void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm) 
	iwl_mvm_bt_coex_notif_handle(mvm);

}



int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,

				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *dev_cmd)

void iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,

				   struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	u32 ant_isolation = le32_to_cpup((void *)pkt->data);
@@ -957,20 +952,23 @@ int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm, 
	u8 __maybe_unused lower_bound, upper_bound;

	u8 lut;



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

		return iwl_mvm_rx_ant_coupling_notif_old(mvm, rxb, dev_cmd);

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

			IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {

		iwl_mvm_rx_ant_coupling_notif_old(mvm, rxb);

		return;

	}



	if (!iwl_mvm_bt_is_plcr_supported(mvm))

		return 0;

		return;



	lockdep_assert_held(&mvm->mutex);



	/* Ignore updates if we are in force mode */

	if (unlikely(mvm->bt_force_ant_mode != BT_FORCE_ANT_DIS))

		return 0;

		return;



	if (ant_isolation ==  mvm->last_ant_isol)

		return 0;

		return;



	for (lut = 0; lut < ARRAY_SIZE(antenna_coupling_ranges) - 1; lut++)

		if (ant_isolation < antenna_coupling_ranges[lut + 1].range)
@@ -989,7 +987,7 @@ int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm, 
	mvm->last_ant_isol = ant_isolation;



	if (mvm->last_corun_lut == lut)

		return 0;

		return;



	mvm->last_corun_lut = lut;
@@ -1000,6 +998,8 @@ int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm, 
	memcpy(&cmd.corun_lut40, antenna_coupling_ranges[lut].lut20,

	       sizeof(cmd.corun_lut40));



	return iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_CORUN_LUT, 0,

				    sizeof(cmd), &cmd);

	if (iwl_mvm_send_cmd_pdu(mvm, BT_COEX_UPDATE_CORUN_LUT, 0,

				 sizeof(cmd), &cmd))

		IWL_ERR(mvm,

			"failed to send BT_COEX_UPDATE_CORUN_LUT command\n");

}

drivers/net/wireless/iwlwifi/mvm/coex_legacy.c

+11 −20
Original line number Diff line number Diff line
@@ -1058,9 +1058,8 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm) 
		IWL_ERR(mvm, "Failed to update the ctrl_kill_msk\n");

}



int iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb,

				 struct iwl_device_cmd *dev_cmd)

void iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm,

				  struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_bt_coex_profile_notif_old *notif = (void *)pkt->data;
@@ -1083,12 +1082,6 @@ int iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm, 
	memcpy(&mvm->last_bt_notif_old, notif, sizeof(mvm->last_bt_notif_old));



	iwl_mvm_bt_coex_notif_handle(mvm);



	/*

	 * This is an async handler for a notification, returning anything other

	 * than 0 doesn't make sense even if HCMD failed.

	 */

	return 0;

}



static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
@@ -1250,14 +1243,12 @@ void iwl_mvm_bt_coex_vif_change_old(struct iwl_mvm *mvm) 
	iwl_mvm_bt_coex_notif_handle(mvm);

}



int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm,

				      struct iwl_rx_cmd_buffer *rxb,

				      struct iwl_device_cmd *dev_cmd)

void iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm,

				       struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	u32 ant_isolation = le32_to_cpup((void *)pkt->data);

	u8 __maybe_unused lower_bound, upper_bound;

	int ret;

	u8 lut;



	struct iwl_bt_coex_cmd_old *bt_cmd;
@@ -1268,16 +1259,16 @@ int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm, 
	};



	if (!iwl_mvm_bt_is_plcr_supported(mvm))

		return 0;

		return;



	lockdep_assert_held(&mvm->mutex);



	/* Ignore updates if we are in force mode */

	if (unlikely(mvm->bt_force_ant_mode != BT_FORCE_ANT_DIS))

		return 0;

		return;



	if (ant_isolation ==  mvm->last_ant_isol)

		return 0;

		return;



	for (lut = 0; lut < ARRAY_SIZE(antenna_coupling_ranges) - 1; lut++)

		if (ant_isolation < antenna_coupling_ranges[lut + 1].range)
@@ -1296,13 +1287,13 @@ int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm, 
	mvm->last_ant_isol = ant_isolation;



	if (mvm->last_corun_lut == lut)

		return 0;

		return;



	mvm->last_corun_lut = lut;



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

	if (!bt_cmd)

		return 0;

		return;

	cmd.data[0] = bt_cmd;



	bt_cmd->flags = cpu_to_le32(BT_COEX_NW_OLD);
@@ -1317,8 +1308,8 @@ int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm, 
	memcpy(bt_cmd->bt4_corun_lut40, antenna_coupling_ranges[lut].lut20,

	       sizeof(bt_cmd->bt4_corun_lut40));



	ret = iwl_mvm_send_cmd(mvm, &cmd);

	if (iwl_mvm_send_cmd(mvm, &cmd))

		IWL_ERR(mvm, "failed to send BT_CONFIG command\n");



	kfree(bt_cmd);

	return ret;

}

drivers/net/wireless/iwlwifi/mvm/fw.c

+4 −9
Original line number Diff line number Diff line
@@ -814,9 +814,8 @@ int iwl_mvm_load_d3_fw(struct iwl_mvm *mvm) 
	return ret;

}



int iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,

				    struct iwl_rx_cmd_buffer *rxb,

				    struct iwl_device_cmd *cmd)

void iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_card_state_notif *card_state_notif = (void *)pkt->data;
@@ -827,13 +826,10 @@ int iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm, 
			  (flags & SW_CARD_DISABLED) ? "Kill" : "On",

			  (flags & CT_KILL_CARD_DISABLED) ?

			  "Reached" : "Not reached");



	return 0;

}



int iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,

			    struct iwl_rx_cmd_buffer *rxb,

			    struct iwl_device_cmd *cmd)

void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_mfuart_load_notif *mfuart_notif = (void *)pkt->data;
@@ -844,5 +840,4 @@ int iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm, 
		       le32_to_cpu(mfuart_notif->external_ver),

		       le32_to_cpu(mfuart_notif->status),

		       le32_to_cpu(mfuart_notif->duration));

	return 0;

}

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

+4 −9
Original line number Diff line number Diff line
@@ -1312,9 +1312,8 @@ static void iwl_mvm_csa_count_down(struct iwl_mvm *mvm, 
	}

}



int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,

			    struct iwl_rx_cmd_buffer *rxb,

			    struct iwl_device_cmd *cmd)

void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_extended_beacon_notif *beacon = (void *)pkt->data;
@@ -1365,8 +1364,6 @@ int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm, 
			RCU_INIT_POINTER(mvm->csa_tx_blocked_vif, NULL);

		}

	}



	return 0;

}



static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac,
@@ -1415,9 +1412,8 @@ static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac, 
		iwl_mvm_fw_dbg_collect_trig(mvm, trigger, NULL);

}



int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,

				    struct iwl_rx_cmd_buffer *rxb,

				    struct iwl_device_cmd *cmd)

void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,

				     struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_missed_beacons_notif *mb = (void *)pkt->data;
@@ -1434,5 +1430,4 @@ int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm, 
						   IEEE80211_IFACE_ITER_NORMAL,

						   iwl_mvm_beacon_loss_iterator,

						   mb);

	return 0;

}

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

+42 −65
Original line number Diff line number Diff line
@@ -1012,9 +1012,8 @@ static inline void iwl_mvm_wait_for_async_handlers(struct iwl_mvm *mvm) 
/* Statistics */

void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,

				  struct iwl_rx_packet *pkt);

int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,

			  struct iwl_rx_cmd_buffer *rxb,

			  struct iwl_device_cmd *cmd);

void iwl_mvm_rx_statistics(struct iwl_mvm *mvm,

			   struct iwl_rx_cmd_buffer *rxb);

int iwl_mvm_request_statistics(struct iwl_mvm *mvm, bool clear);

void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm);
@@ -1060,27 +1059,19 @@ bool iwl_mvm_bcast_filter_build_cmd(struct iwl_mvm *mvm, 
 * FW notifications / CMD responses handlers

 * Convention: iwl_mvm_rx_<NAME OF THE CMD>

 */

int iwl_mvm_rx_rx_phy_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

			  struct iwl_device_cmd *cmd);

int iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

		       struct iwl_device_cmd *cmd);

int iwl_mvm_rx_tx_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

		      struct iwl_device_cmd *cmd);

int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

			struct iwl_device_cmd *cmd);

int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,

				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *cmd);

int iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

			  struct iwl_device_cmd *cmd);

int iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,

				struct iwl_rx_cmd_buffer *rxb,

				struct iwl_device_cmd *cmd);

int iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

			    struct iwl_device_cmd *cmd);

int iwl_mvm_rx_shared_mem_cfg_notif(struct iwl_mvm *mvm,

				    struct iwl_rx_cmd_buffer *rxb,

				    struct iwl_device_cmd *cmd);

void iwl_mvm_rx_rx_phy_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_tx_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,

				   struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_card_state_notif(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_shared_mem_cfg_notif(struct iwl_mvm *mvm,

				     struct iwl_rx_cmd_buffer *rxb);



/* MVM PHY */

int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,
@@ -1107,12 +1098,10 @@ int iwl_mvm_mac_ctxt_remove(struct iwl_mvm *mvm, struct ieee80211_vif *vif); 
u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif);

int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,

				    struct ieee80211_vif *vif);

int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,

			    struct iwl_rx_cmd_buffer *rxb,

			    struct iwl_device_cmd *cmd);

int iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,

				    struct iwl_rx_cmd_buffer *rxb,

				    struct iwl_device_cmd *cmd);

void iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,

				     struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_mac_ctxt_recalc_tsf_id(struct iwl_mvm *mvm,

				    struct ieee80211_vif *vif);

unsigned long iwl_mvm_get_used_hw_queues(struct iwl_mvm *mvm,
@@ -1136,29 +1125,24 @@ int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm); 
void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);



/* Scheduled scan */

int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,

					struct iwl_rx_cmd_buffer *rxb,

					struct iwl_device_cmd *cmd);

int iwl_mvm_rx_lmac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					     struct iwl_rx_cmd_buffer *rxb,

					     struct iwl_device_cmd *cmd);

void iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,

					 struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_lmac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					      struct iwl_rx_cmd_buffer *rxb);

int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,

			     struct ieee80211_vif *vif,

			     struct cfg80211_sched_scan_request *req,

			     struct ieee80211_scan_ies *ies,

			     int type);

int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,

				struct iwl_rx_cmd_buffer *rxb,

				struct iwl_device_cmd *cmd);

void iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb);



/* UMAC scan */

int iwl_mvm_config_scan(struct iwl_mvm *mvm);

int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,

					struct iwl_rx_cmd_buffer *rxb,

					struct iwl_device_cmd *cmd);

int iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					     struct iwl_rx_cmd_buffer *rxb,

					     struct iwl_device_cmd *cmd);

void iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,

					 struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					      struct iwl_rx_cmd_buffer *rxb);



/* MVM debugfs */

#ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -1197,9 +1181,8 @@ int iwl_mvm_power_mac_dbgfs_read(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
				 char *buf, int bufsz);



void iwl_mvm_power_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif);

int iwl_mvm_power_uapsd_misbehaving_ap_notif(struct iwl_mvm *mvm,

					     struct iwl_rx_cmd_buffer *rxb,

					     struct iwl_device_cmd *cmd);

void iwl_mvm_power_uapsd_misbehaving_ap_notif(struct iwl_mvm *mvm,

					      struct iwl_rx_cmd_buffer *rxb);



#ifdef CONFIG_IWLWIFI_LEDS

int iwl_mvm_leds_init(struct iwl_mvm *mvm);
@@ -1255,9 +1238,8 @@ int _iwl_mvm_exit_d0i3(struct iwl_mvm *mvm); 


/* BT Coex */

int iwl_send_bt_init_conf(struct iwl_mvm *mvm);

int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,

			     struct iwl_rx_cmd_buffer *rxb,

			     struct iwl_device_cmd *cmd);

void iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,

			      struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			   enum ieee80211_rssi_event_data);

void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm);
@@ -1275,9 +1257,8 @@ u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr, 
bool iwl_mvm_bt_coex_is_shared_ant_avail_old(struct iwl_mvm *mvm);

void iwl_mvm_bt_coex_vif_change_old(struct iwl_mvm *mvm);

int iwl_send_bt_init_conf_old(struct iwl_mvm *mvm);

int iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm,

				 struct iwl_rx_cmd_buffer *rxb,

				 struct iwl_device_cmd *cmd);

void iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm,

				  struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_bt_rssi_event_old(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			       enum ieee80211_rssi_event_data);

u16 iwl_mvm_coex_agg_time_limit_old(struct iwl_mvm *mvm,
@@ -1286,9 +1267,8 @@ bool iwl_mvm_bt_coex_is_mimo_allowed_old(struct iwl_mvm *mvm, 
					 struct ieee80211_sta *sta);

bool iwl_mvm_bt_coex_is_tpc_allowed_old(struct iwl_mvm *mvm,

					enum ieee80211_band band);

int iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm,

				      struct iwl_rx_cmd_buffer *rxb,

				      struct iwl_device_cmd *cmd);

void iwl_mvm_rx_ant_coupling_notif_old(struct iwl_mvm *mvm,

				       struct iwl_rx_cmd_buffer *rxb);



/* beacon filtering */

#ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -1377,9 +1357,8 @@ static inline void iwl_mvm_enable_agg_txq(struct iwl_mvm *mvm, int queue, 
/* Thermal management and CT-kill */

void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);

void iwl_mvm_tt_temp_changed(struct iwl_mvm *mvm, u32 temp);

int iwl_mvm_temp_notif(struct iwl_mvm *mvm,

		       struct iwl_rx_cmd_buffer *rxb,

		       struct iwl_device_cmd *cmd);

void iwl_mvm_temp_notif(struct iwl_mvm *mvm,

			struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_tt_handler(struct iwl_mvm *mvm);

void iwl_mvm_tt_initialize(struct iwl_mvm *mvm, u32 min_backoff);

void iwl_mvm_tt_exit(struct iwl_mvm *mvm);
@@ -1391,9 +1370,8 @@ struct iwl_mcc_update_resp * 
iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,

		   enum iwl_mcc_source src_id);

int iwl_mvm_init_mcc(struct iwl_mvm *mvm);

int iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,

			       struct iwl_rx_cmd_buffer *rxb,

			       struct iwl_device_cmd *cmd);

void iwl_mvm_rx_chub_update_mcc(struct iwl_mvm *mvm,

				struct iwl_rx_cmd_buffer *rxb);

struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,

						  const char *alpha2,

						  enum iwl_mcc_source src_id,
@@ -1432,8 +1410,7 @@ void iwl_mvm_tdls_recv_channel_switch(struct ieee80211_hw *hw, 
void iwl_mvm_tdls_cancel_channel_switch(struct ieee80211_hw *hw,

					struct ieee80211_vif *vif,

					struct ieee80211_sta *sta);

int iwl_mvm_rx_tdls_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,

			  struct iwl_device_cmd *cmd);

void iwl_mvm_rx_tdls_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

void iwl_mvm_tdls_ch_switch_work(struct work_struct *work);



struct ieee80211_vif *iwl_mvm_get_bss_vif(struct iwl_mvm *mvm);