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

Commit aca86268 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: make a lot of functions static 



A lot of functions were temporarily made non-static
for experimental work, make them static again now.

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

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

+11 −10
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ static int iwlagn_disconn_pan(struct iwl_priv *priv, 
	return ret;

}



void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)

static void iwlagn_update_qos(struct iwl_priv *priv,

			      struct iwl_rxon_context *ctx)

{

	int ret;
@@ -202,7 +203,7 @@ void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
		IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n");

}



int iwlagn_update_beacon(struct iwl_priv *priv,

static int iwlagn_update_beacon(struct iwl_priv *priv,

				struct ieee80211_vif *vif)

{

	lockdep_assert_held(&priv->mutex);
@@ -863,7 +864,7 @@ static int iwl_check_rxon_cmd(struct iwl_priv *priv, 
 * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that

 * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.

 */

int iwl_full_rxon_required(struct iwl_priv *priv,

static int iwl_full_rxon_required(struct iwl_priv *priv,

				  struct iwl_rxon_context *ctx)

{

	const struct iwl_rxon_cmd *staging = &ctx->staging;
@@ -1294,7 +1295,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
	return ret;

}



void iwlagn_check_needed_chains(struct iwl_priv *priv,

static void iwlagn_check_needed_chains(struct iwl_priv *priv,

				       struct iwl_rxon_context *ctx,

				       struct ieee80211_bss_conf *bss_conf)

{
@@ -1388,7 +1389,7 @@ void iwlagn_check_needed_chains(struct iwl_priv *priv, 
	ht_conf->single_chain_sufficient = !need_multiple;

}



void iwlagn_chain_noise_reset(struct iwl_priv *priv)

static void iwlagn_chain_noise_reset(struct iwl_priv *priv)

{

	struct iwl_chain_noise_data *data = &priv->chain_noise_data;

	int ret;

drivers/net/wireless/iwlwifi/iwl-agn.c

+16 −16
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static const u8 iwlagn_pan_ac_to_queue[] = { 
	7, 6, 5, 4,

};



void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)

static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)

{

	int i;
@@ -644,7 +644,7 @@ void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags) 
	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);

}



void iwl_rf_kill_ct_config(struct iwl_priv *priv)

static void iwl_rf_kill_ct_config(struct iwl_priv *priv)

{

	struct iwl_ct_kill_config cmd;

	struct iwl_ct_kill_throttling_config adv_cmd;
@@ -725,7 +725,7 @@ static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) 
	}

}



void iwl_send_bt_config(struct iwl_priv *priv)

static void iwl_send_bt_config(struct iwl_priv *priv)

{

	struct iwl_bt_cmd bt_cmd = {

		.lead_time = BT_LEAD_TIME_DEF,
@@ -1080,7 +1080,7 @@ static void iwlagn_disable_roc_work(struct work_struct *work) 
 *

 *****************************************************************************/



void iwl_setup_deferred_work(struct iwl_priv *priv)

static void iwl_setup_deferred_work(struct iwl_priv *priv)

{

	priv->workqueue = create_singlethread_workqueue(DRV_NAME);
@@ -1331,7 +1331,7 @@ static void iwl_free_geos(struct iwl_priv *priv) 
	clear_bit(STATUS_GEO_CONFIGURED, &priv->status);

}



int iwl_init_drv(struct iwl_priv *priv)

static int iwl_init_drv(struct iwl_priv *priv)

{

	int ret;
@@ -1394,7 +1394,7 @@ err: 
	return ret;

}



void iwl_uninit_drv(struct iwl_priv *priv)

static void iwl_uninit_drv(struct iwl_priv *priv)

{

	iwl_free_geos(priv);

	iwl_free_channel_map(priv);
@@ -1407,7 +1407,7 @@ void iwl_uninit_drv(struct iwl_priv *priv) 
#endif

}



void iwl_set_hw_params(struct iwl_priv *priv)

static void iwl_set_hw_params(struct iwl_priv *priv)

{

	if (priv->cfg->ht_params)

		priv->hw_params.use_rts_for_aggregation =
@@ -1423,7 +1423,7 @@ void iwl_set_hw_params(struct iwl_priv *priv) 




/* show what optional capabilities we have */

void iwl_option_config(struct iwl_priv *priv)

static void iwl_option_config(struct iwl_priv *priv)

{

#ifdef CONFIG_IWLWIFI_DEBUG

	IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUG enabled\n");
@@ -1722,7 +1722,7 @@ out: 
	return op_mode;

}



void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)

static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
@@ -2187,7 +2187,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 
	}

}



void iwl_nic_error(struct iwl_op_mode *op_mode)

static void iwl_nic_error(struct iwl_op_mode *op_mode)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
@@ -2200,7 +2200,7 @@ void iwl_nic_error(struct iwl_op_mode *op_mode) 
	iwlagn_fw_error(priv, false);

}



void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)

static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
@@ -2210,7 +2210,7 @@ void iwl_cmd_queue_full(struct iwl_op_mode *op_mode) 
	}

}



void iwl_nic_config(struct iwl_op_mode *op_mode)

static void iwl_nic_config(struct iwl_op_mode *op_mode)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
@@ -2225,7 +2225,7 @@ static void iwl_wimax_active(struct iwl_op_mode *op_mode) 
	IWL_ERR(priv, "RF is used by WiMAX\n");

}



void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)

static void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);

	int mq = priv->queue_to_mac80211[queue];
@@ -2244,7 +2244,7 @@ void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue) 
	ieee80211_stop_queue(priv->hw, mq);

}



void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)

static void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);

	int mq = priv->queue_to_mac80211[queue];
@@ -2284,7 +2284,7 @@ void iwlagn_lift_passive_no_rx(struct iwl_priv *priv) 
	priv->passive_no_rx = false;

}



void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)

static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)

{

	struct ieee80211_tx_info *info;
@@ -2293,7 +2293,7 @@ void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb) 
	dev_kfree_skb_any(skb);

}



void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)

static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);

drivers/net/wireless/iwlwifi/iwl-agn.h

+0 −81
Original line number Diff line number Diff line
@@ -523,85 +523,4 @@ static inline const char *iwl_dvm_get_cmd_string(u8 cmd) 
		return s;

	return "UNKNOWN";

}



/* API method exported for mvm hybrid state */

void iwl_setup_deferred_work(struct iwl_priv *priv);

int iwl_send_wimax_coex(struct iwl_priv *priv);

int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);

void iwl_option_config(struct iwl_priv *priv);

void iwl_set_hw_params(struct iwl_priv *priv);

void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);

int iwl_init_drv(struct iwl_priv *priv);

void iwl_uninit_drv(struct iwl_priv *priv);

void iwl_send_bt_config(struct iwl_priv *priv);

void iwl_rf_kill_ct_config(struct iwl_priv *priv);

int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx);

void iwl_teardown_interface(struct iwl_priv *priv,

			    struct ieee80211_vif *vif,

			    bool mode_change);

int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx);

void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx);

void iwlagn_check_needed_chains(struct iwl_priv *priv,

				struct iwl_rxon_context *ctx,

				struct ieee80211_bss_conf *bss_conf);

void iwlagn_chain_noise_reset(struct iwl_priv *priv);

int iwlagn_update_beacon(struct iwl_priv *priv,

			 struct ieee80211_vif *vif);

void iwl_tt_handler(struct iwl_priv *priv);

void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode);

void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue);

void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);

void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb);

void iwl_nic_error(struct iwl_op_mode *op_mode);

void iwl_cmd_queue_full(struct iwl_op_mode *op_mode);

void iwl_nic_config(struct iwl_op_mode *op_mode);

int iwlagn_mac_set_tim(struct ieee80211_hw *hw,

		       struct ieee80211_sta *sta, bool set);

void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,

			      enum ieee80211_rssi_event rssi_event);

int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw);

int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw);

void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop);

void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue);

void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

			       struct ieee80211_channel_switch *ch_switch);

int iwlagn_mac_sta_state(struct ieee80211_hw *hw,

			 struct ieee80211_vif *vif,

			 struct ieee80211_sta *sta,

			 enum ieee80211_sta_state old_state,

			 enum ieee80211_sta_state new_state);

int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

			    struct ieee80211_vif *vif,

			    enum ieee80211_ampdu_mlme_action action,

			    struct ieee80211_sta *sta, u16 tid, u16 *ssn,

			    u8 buf_size);

int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,

		       struct ieee80211_vif *vif,

		       struct cfg80211_scan_request *req);

void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,

			   struct ieee80211_vif *vif,

			   enum sta_notify_cmd cmd,

			   struct ieee80211_sta *sta);

void iwlagn_configure_filter(struct ieee80211_hw *hw,

			     unsigned int changed_flags,

			     unsigned int *total_flags,

			     u64 multicast);

int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,

		       struct ieee80211_vif *vif, u16 queue,

		       const struct ieee80211_tx_queue_params *params);

void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif,

			       struct cfg80211_gtk_rekey_data *data);

void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_key_conf *keyconf,

				struct ieee80211_sta *sta,

				u32 iv32, u16 *phase1key);

int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

		       struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta,

		       struct ieee80211_key_conf *key);

void iwlagn_mac_stop(struct ieee80211_hw *hw);

void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);

int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);

#endif /* __iwl_agn_h__ */

drivers/net/wireless/iwlwifi/iwl-mac80211.c

+54 −52
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) 
	return 0;

}



void iwlagn_mac_stop(struct ieee80211_hw *hw)

static void iwlagn_mac_stop(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -366,7 +366,7 @@ void iwlagn_mac_stop(struct ieee80211_hw *hw) 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,

static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,

				      struct ieee80211_vif *vif,

				      struct cfg80211_gtk_rekey_data *data)

{
@@ -394,7 +394,8 @@ void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw, 


#ifdef CONFIG_PM_SLEEP



int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)

static int iwlagn_mac_suspend(struct ieee80211_hw *hw,

			      struct cfg80211_wowlan *wowlan)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
@@ -505,7 +506,7 @@ static void iwlagn_mac_set_wakeup(struct ieee80211_hw *hw, bool enabled) 
}

#endif



void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -516,7 +517,7 @@ void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		dev_kfree_skb_any(skb);

}



void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,

				       struct ieee80211_vif *vif,

				       struct ieee80211_key_conf *keyconf,

				       struct ieee80211_sta *sta,
@@ -527,7 +528,7 @@ void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw, 
	iwl_update_tkip_key(priv, vif, keyconf, sta, iv32, phase1key);

}



int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

			      struct ieee80211_vif *vif,

			      struct ieee80211_sta *sta,

			      struct ieee80211_key_conf *key)
@@ -630,7 +631,7 @@ int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   enum ieee80211_ampdu_mlme_action action,

				   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
@@ -756,7 +757,7 @@ static int iwlagn_mac_sta_remove(struct ieee80211_hw *hw, 
	return ret;

}



int iwlagn_mac_sta_state(struct ieee80211_hw *hw,

static int iwlagn_mac_sta_state(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta,

				enum ieee80211_sta_state old_state,
@@ -839,7 +840,7 @@ int iwlagn_mac_sta_state(struct ieee80211_hw *hw, 
	return ret;

}



void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

				      struct ieee80211_channel_switch *ch_switch)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -934,7 +935,7 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success) 
		ieee80211_chswitch_done(ctx->vif, is_success);

}



void iwlagn_configure_filter(struct ieee80211_hw *hw,

static void iwlagn_configure_filter(struct ieee80211_hw *hw,

				    unsigned int changed_flags,

				    unsigned int *total_flags,

				    u64 multicast)
@@ -984,7 +985,7 @@ void iwlagn_configure_filter(struct ieee80211_hw *hw, 
			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;

}



void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)

static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -1111,7 +1112,7 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw, 
	return err;

}



int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)

static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -1128,7 +1129,7 @@ int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw) 
	return 0;

}



void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,

static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,

				     enum ieee80211_rssi_event rssi_event)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -1153,7 +1154,7 @@ void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw, 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



int iwlagn_mac_set_tim(struct ieee80211_hw *hw,

static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,

			      struct ieee80211_sta *sta, bool set)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -1163,7 +1164,7 @@ int iwlagn_mac_set_tim(struct ieee80211_hw *hw, 
	return 0;

}



int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,

static int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif, u16 queue,

			      const struct ieee80211_tx_queue_params *params)

{
@@ -1207,7 +1208,7 @@ int iwlagn_mac_conf_tx(struct ieee80211_hw *hw, 
	return 0;

}



int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)

static int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
@@ -1223,7 +1224,8 @@ static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	return iwlagn_commit_rxon(priv, ctx);

}



int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx)

static int iwl_setup_interface(struct iwl_priv *priv,

			       struct iwl_rxon_context *ctx)

{

	struct ieee80211_vif *vif = ctx->vif;

	int err, ac;
@@ -1343,7 +1345,7 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw, 
	return err;

}



void iwl_teardown_interface(struct iwl_priv *priv,

static void iwl_teardown_interface(struct iwl_priv *priv,

				   struct ieee80211_vif *vif,

				   bool mode_change)

{
@@ -1486,7 +1488,7 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw, 
	return err;

}



int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,

static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif,

			      struct cfg80211_scan_request *req)

{
@@ -1543,7 +1545,7 @@ static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id) 
	iwl_send_add_sta(priv, &cmd, CMD_ASYNC);

}



void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,

static void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  enum sta_notify_cmd cmd,

				  struct ieee80211_sta *sta)

drivers/net/wireless/iwlwifi/iwl-ucode.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int iwl_init_alive_start(struct iwl_priv *priv) 
	return 0;

}



int iwl_send_wimax_coex(struct iwl_priv *priv)

static int iwl_send_wimax_coex(struct iwl_priv *priv)

{

	struct iwl_wimax_coex_cmd coex_cmd;