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

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

mac80211: QoS related cleanups 



This
 * makes the queue number passed to drivers a u16
   (as it will be with skb_get_queue_mapping)
 * removes the useless queue number defines
 * splits hw->queues into hw->queues/ampdu_queues
 * removes the debugfs files for per-queue counters
 * removes some dead QoS code
 * removes the beacon queue configuration for IBSS
   so that the drivers now never get a queue number
   bigger than (hw->queues + hw->ampdu_queues - 1)
   for tx and only in the range 0..hw->queues-1 for
   conf_tx.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 36fc6757

drivers/net/wireless/b43/main.c

+1 −2
Original line number Diff line number Diff line
@@ -2996,8 +2996,7 @@ static void b43_qos_update_work(struct work_struct *work) 
	mutex_unlock(&wl->mutex);

}



static int b43_op_conf_tx(struct ieee80211_hw *hw,

			  int _queue,

static int b43_op_conf_tx(struct ieee80211_hw *hw, u16 _queue,

			  const struct ieee80211_tx_queue_params *params)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

drivers/net/wireless/b43legacy/main.c

+1 −2
Original line number Diff line number Diff line
@@ -2383,8 +2383,7 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw, 
	return NETDEV_TX_OK;

}



static int b43legacy_op_conf_tx(struct ieee80211_hw *hw,

				int queue,

static int b43legacy_op_conf_tx(struct ieee80211_hw *hw, u16 queue,

				const struct ieee80211_tx_queue_params *params)

{

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ static void iwlcore_init_hw(struct iwl_priv *priv) 
	hw->queues = 4;

#ifdef CONFIG_IWL4965_HT

	/* Enhanced value; more queues, to support 11n aggregation */

	hw->queues = 16;

	hw->ampdu_queues = 12;

#endif /* CONFIG_IWL4965_HT */

}

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

+1 −1
Original line number Diff line number Diff line
@@ -7143,7 +7143,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return rc;

}



static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, int queue,

static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,

			   const struct ieee80211_tx_queue_params *params)

{

	struct iwl3945_priv *priv = hw->priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -6339,7 +6339,7 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,

static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,

			   const struct ieee80211_tx_queue_params *params)

{

	struct iwl_priv *priv = hw->priv;