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

Commit b55e75ed authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlwifi: remove STATUS_MODE_PENDING 



Since rfkill integration, mac80211 can no
longer add an interface while the hardware
is not ready, so STATUS_MODE_PENDING can
never be set.

Also, remove another superfluous channel
sanity check and return the commit_rxon
return value in case it failed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 76c9cc18

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -2144,9 +2144,6 @@ static void iwl_alive_start(struct iwl_priv *priv) 




	iwl_power_update_mode(priv, true);

	iwl_power_update_mode(priv, true);





	if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))

		iwl_set_mode(priv, priv->iw_mode);



	return;

	return;





 restart:

 restart:

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

+19 −34
Original line number Original line Diff line number Diff line
@@ -2275,23 +2275,9 @@ int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) 
}

}

EXPORT_SYMBOL(iwl_mac_beacon_update);

EXPORT_SYMBOL(iwl_mac_beacon_update);





int iwl_set_mode(struct iwl_priv *priv, int mode)

static int iwl_set_mode(struct iwl_priv *priv, struct ieee80211_vif *vif)

{

{

	if (mode == NL80211_IFTYPE_ADHOC) {

	iwl_connection_init_rx_config(priv, vif->type);

		const struct iwl_channel_info *ch_info;



		ch_info = iwl_get_channel_info(priv,

			priv->band,

			le16_to_cpu(priv->staging_rxon.channel));



		if (!ch_info || !is_channel_ibss(ch_info)) {

			IWL_ERR(priv, "channel %d not IBSS channel\n",

				  le16_to_cpu(priv->staging_rxon.channel));

			return -EINVAL;

		}

	}



	iwl_connection_init_rx_config(priv, mode);





	if (priv->cfg->ops->hcmd->set_rxon_chain)

	if (priv->cfg->ops->hcmd->set_rxon_chain)

		priv->cfg->ops->hcmd->set_rxon_chain(priv);

		priv->cfg->ops->hcmd->set_rxon_chain(priv);
@@ -2300,18 +2286,10 @@ int iwl_set_mode(struct iwl_priv *priv, int mode) 




	iwl_clear_stations_table(priv);

	iwl_clear_stations_table(priv);





	/* dont commit rxon if rf-kill is on*/

	return iwlcore_commit_rxon(priv);

	if (!iwl_is_ready_rf(priv))

		return -EAGAIN;



	iwlcore_commit_rxon(priv);



	return 0;

}

}

EXPORT_SYMBOL(iwl_set_mode);





int iwl_mac_add_interface(struct ieee80211_hw *hw,

int iwl_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

				 struct ieee80211_vif *vif)

{

{

	struct iwl_priv *priv = hw->priv;

	struct iwl_priv *priv = hw->priv;

	int err = 0;

	int err = 0;
@@ -2320,6 +2298,11 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, 




	mutex_lock(&priv->mutex);

	mutex_lock(&priv->mutex);





	if (WARN_ON(!iwl_is_ready_rf(priv))) {

		err = -EINVAL;

		goto out;

	}



	if (priv->vif) {

	if (priv->vif) {

		IWL_DEBUG_MAC80211(priv, "leave - vif != NULL\n");

		IWL_DEBUG_MAC80211(priv, "leave - vif != NULL\n");

		err = -EOPNOTSUPP;

		err = -EOPNOTSUPP;
@@ -2329,15 +2312,17 @@ int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	priv->vif = vif;

	priv->vif = vif;

	priv->iw_mode = vif->type;

	priv->iw_mode = vif->type;





	if (vif->addr) {

	IWL_DEBUG_MAC80211(priv, "Set %pM\n", vif->addr);

	IWL_DEBUG_MAC80211(priv, "Set %pM\n", vif->addr);

	memcpy(priv->mac_addr, vif->addr, ETH_ALEN);

	memcpy(priv->mac_addr, vif->addr, ETH_ALEN);

	}





	if (iwl_set_mode(priv, vif->type) == -EAGAIN)

	err = iwl_set_mode(priv, vif);

		/* we are not ready, will run again when ready */

	if (err)

		set_bit(STATUS_MODE_PENDING, &priv->status);

		goto out_err;

	goto out;





 out_err:

	priv->vif = NULL;

	priv->iw_mode = NL80211_IFTYPE_STATION;

 out:

 out:

	mutex_unlock(&priv->mutex);

	mutex_unlock(&priv->mutex);

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -336,7 +336,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, 
				     u32 changes);

				     u32 changes);

int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb);

int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb);

int iwl_commit_rxon(struct iwl_priv *priv);

int iwl_commit_rxon(struct iwl_priv *priv);

int iwl_set_mode(struct iwl_priv *priv, int mode);

int iwl_mac_add_interface(struct ieee80211_hw *hw,

int iwl_mac_add_interface(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif);

			  struct ieee80211_vif *vif);

void iwl_mac_remove_interface(struct ieee80211_hw *hw,

void iwl_mac_remove_interface(struct ieee80211_hw *hw,
@@ -617,7 +616,6 @@ void iwlcore_free_geos(struct iwl_priv *priv); 
#define STATUS_SCAN_HW		15

#define STATUS_SCAN_HW		15

#define STATUS_POWER_PMI	16

#define STATUS_POWER_PMI	16

#define STATUS_FW_ERROR		17

#define STATUS_FW_ERROR		17

#define STATUS_MODE_PENDING	18









static inline int iwl_is_ready(struct iwl_priv *priv)

static inline int iwl_is_ready(struct iwl_priv *priv)

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -560,8 +560,6 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, 
		test_bit(STATUS_POWER_PMI, &priv->status));

		test_bit(STATUS_POWER_PMI, &priv->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",

		test_bit(STATUS_FW_ERROR, &priv->status));

		test_bit(STATUS_FW_ERROR, &priv->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_MODE_PENDING:\t %d\n",

		test_bit(STATUS_MODE_PENDING, &priv->status));

	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}

}

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -2537,9 +2537,6 @@ static void iwl3945_alive_start(struct iwl_priv *priv) 
	set_bit(STATUS_READY, &priv->status);

	set_bit(STATUS_READY, &priv->status);

	wake_up_interruptible(&priv->wait_command_queue);

	wake_up_interruptible(&priv->wait_command_queue);





	if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))

		iwl_set_mode(priv, priv->iw_mode);



	return;

	return;





 restart:

 restart: