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

Commit e20d4341 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: move the stop / wake queue logic to transport layer 



priv->mac80211_registered and priv->hw needed to move to shared.
stop_queue API was added in order to allow the upper layer to stop
the SW queues for regulatory purposes.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f22be624

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

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void iwl_perform_ct_kill_task(struct iwl_priv *priv, 
{

	if (stop) {

		IWL_DEBUG_TEMP(priv, "Stop all queues\n");

		if (priv->mac80211_registered)

		if (priv->shrd->mac80211_registered)

			ieee80211_stop_queues(priv->hw);

		IWL_DEBUG_TEMP(priv,

				"Schedule 5 seconds CT_KILL Timer\n");
@@ -217,7 +217,7 @@ static void iwl_perform_ct_kill_task(struct iwl_priv *priv, 
			  jiffies + CT_KILL_EXIT_DURATION * HZ);

	} else {

		IWL_DEBUG_TEMP(priv, "Wake all queues\n");

		if (priv->mac80211_registered)

		if (priv->shrd->mac80211_registered)

			ieee80211_wake_queues(priv->hw);

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) 
			    iwl_is_associated_ctx(ctx) && ctx->vif &&

			    ctx->vif->type == NL80211_IFTYPE_STATION) {

				ctx->last_tx_rejected = true;

				iwl_stop_queue(priv, &priv->txq[txq_id]);

				iwl_trans_stop_queue(trans(priv), txq_id);



				IWL_DEBUG_TX_REPLY(priv,

					   "TXQ %d status %s (0x%08x) "

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

+5 −4
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ static void __iwl_down(struct iwl_priv *priv) 
	if (!exit_pending)

		clear_bit(STATUS_EXIT_PENDING, &priv->shrd->status);



	if (priv->mac80211_registered)

	if (priv->shrd->mac80211_registered)

		ieee80211_stop_queues(priv->hw);



	/* Clear out all status bits but a few that are stable across reset */
@@ -1863,7 +1863,7 @@ static int iwl_mac_setup_register(struct iwl_priv *priv, 
		IWL_ERR(priv, "Failed to register hw (error %d)\n", ret);

		return ret;

	}

	priv->mac80211_registered = 1;

	priv->shrd->mac80211_registered = 1;



	return 0;

}
@@ -3243,6 +3243,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	priv->shrd = &priv->_shrd;

	priv->shrd->bus = bus;

	priv->shrd->priv = priv;

	priv->shrd->hw = hw;

	bus_set_drv_data(priv->bus, priv->shrd);



	priv->shrd->trans = trans_ops->alloc(priv->shrd);
@@ -3418,9 +3419,9 @@ void __devexit iwl_remove(struct iwl_priv * priv) 
	iwl_testmode_cleanup(priv);

	iwl_leds_exit(priv);



	if (priv->mac80211_registered) {

	if (priv->shrd->mac80211_registered) {

		ieee80211_unregister_hw(priv->hw);

		priv->mac80211_registered = 0;

		priv->shrd->mac80211_registered = 0;

	}



	iwl_tt_exit(priv);

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

+0 −2
Original line number Diff line number Diff line
@@ -1181,8 +1181,6 @@ struct iwl_priv { 
	/* Indication if ieee80211_ops->open has been called */

	u8 is_open;



	u8 mac80211_registered;



	/* eeprom -- this is in the card's little endian byte order */

	u8 *eeprom;

	int    nvm_device_type;

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

+0 −61
Original line number Diff line number Diff line
@@ -64,67 +64,6 @@ static inline int iwl_queue_dec_wrap(int index, int n_bd) 
	return --index & (n_bd - 1);

}



/*

 * we have 8 bits used like this:

 *

 * 7 6 5 4 3 2 1 0

 * | | | | | | | |

 * | | | | | | +-+-------- AC queue (0-3)

 * | | | | | |

 * | +-+-+-+-+------------ HW queue ID

 * |

 * +---------------------- unused

 */

static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)

{

	BUG_ON(ac > 3);   /* only have 2 bits */

	BUG_ON(hwq > 31); /* only use 5 bits */



	txq->swq_id = (hwq << 2) | ac;

}



static inline void iwl_wake_queue(struct iwl_priv *priv,

				  struct iwl_tx_queue *txq)

{

	u8 queue = txq->swq_id;

	u8 ac = queue & 3;

	u8 hwq = (queue >> 2) & 0x1f;



	if (unlikely(!priv->mac80211_registered))

		return;



	if (test_and_clear_bit(hwq, priv->queue_stopped))

		if (atomic_dec_return(&priv->queue_stop_count[ac]) <= 0)

			ieee80211_wake_queue(priv->hw, ac);

}



static inline void iwl_stop_queue(struct iwl_priv *priv,

				  struct iwl_tx_queue *txq)

{

	u8 queue = txq->swq_id;

	u8 ac = queue & 3;

	u8 hwq = (queue >> 2) & 0x1f;



	if (unlikely(!priv->mac80211_registered))

		return;



	if (!test_and_set_bit(hwq, priv->queue_stopped))

		if (atomic_inc_return(&priv->queue_stop_count[ac]) > 0)

			ieee80211_stop_queue(priv->hw, ac);

}



#ifdef ieee80211_stop_queue

#undef ieee80211_stop_queue

#endif



#define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue



#ifdef ieee80211_wake_queue

#undef ieee80211_wake_queue

#endif



#define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue



static inline void iwl_enable_rfkill_int(struct iwl_priv *priv)

{

	IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n");