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

Commit b5be3efc authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove unused conf variables 



There are a number of conf variables that are
unused, remove them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarWey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 740c1aa3

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -1158,7 +1158,6 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		.flags = CMD_SIZE_HUGE,

		.flags = CMD_SIZE_HUGE,

	};

	};

	struct iwl_scan_cmd *scan;

	struct iwl_scan_cmd *scan;

	struct ieee80211_conf *conf = NULL;

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	u32 rate_flags = 0;

	u32 rate_flags = 0;

	u16 cmd_len;

	u16 cmd_len;
@@ -1175,8 +1174,6 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	if (vif)

	if (vif)

		ctx = iwl_rxon_ctx_from_vif(vif);

		ctx = iwl_rxon_ctx_from_vif(vif);





	conf = ieee80211_get_hw_conf(priv->hw);



	cancel_delayed_work(&priv->scan_check);

	cancel_delayed_work(&priv->scan_check);





	if (!iwl_is_ready(priv)) {

	if (!iwl_is_ready(priv)) {

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -2568,12 +2568,9 @@ static void __iwl3945_down(struct iwl_priv *priv) 
{

{

	unsigned long flags;

	unsigned long flags;

	int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);

	int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);

	struct ieee80211_conf *conf = NULL;





	IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");

	IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");





	conf = ieee80211_get_hw_conf(priv->hw);



	if (!exit_pending)

	if (!exit_pending)

		set_bit(STATUS_EXIT_PENDING, &priv->status);

		set_bit(STATUS_EXIT_PENDING, &priv->status);
@@ -2827,13 +2824,10 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
		.flags = CMD_SIZE_HUGE,

		.flags = CMD_SIZE_HUGE,

	};

	};

	struct iwl3945_scan_cmd *scan;

	struct iwl3945_scan_cmd *scan;

	struct ieee80211_conf *conf = NULL;

	u8 n_probes = 0;

	u8 n_probes = 0;

	enum ieee80211_band band;

	enum ieee80211_band band;

	bool is_active = false;

	bool is_active = false;





	conf = ieee80211_get_hw_conf(priv->hw);



	cancel_delayed_work(&priv->scan_check);

	cancel_delayed_work(&priv->scan_check);





	if (!iwl_is_ready(priv)) {

	if (!iwl_is_ready(priv)) {