|
@@ -4100,52 +4100,6 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
|
|
|
- const struct ieee80211_tx_queue_params *params)
|
|
|
-{
|
|
|
- struct iwl_priv *priv = hw->priv;
|
|
|
- unsigned long flags;
|
|
|
- int q;
|
|
|
-
|
|
|
- IWL_DEBUG_MAC80211(priv, "enter\n");
|
|
|
-
|
|
|
- if (!iwl_is_ready_rf(priv)) {
|
|
|
- IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
-
|
|
|
- if (queue >= AC_NUM) {
|
|
|
- IWL_DEBUG_MAC80211(priv, "leave - queue >= AC_NUM %d\n", queue);
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
- q = AC_NUM - 1 - queue;
|
|
|
-
|
|
|
- spin_lock_irqsave(&priv->lock, flags);
|
|
|
-
|
|
|
- priv->qos_data.def_qos_parm.ac[q].cw_min = cpu_to_le16(params->cw_min);
|
|
|
- priv->qos_data.def_qos_parm.ac[q].cw_max = cpu_to_le16(params->cw_max);
|
|
|
- priv->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
|
|
|
- priv->qos_data.def_qos_parm.ac[q].edca_txop =
|
|
|
- cpu_to_le16((params->txop * 32));
|
|
|
-
|
|
|
- priv->qos_data.def_qos_parm.ac[q].reserved1 = 0;
|
|
|
- priv->qos_data.qos_active = 1;
|
|
|
-
|
|
|
- spin_unlock_irqrestore(&priv->lock, flags);
|
|
|
-
|
|
|
- mutex_lock(&priv->mutex);
|
|
|
- if (priv->iw_mode == NL80211_IFTYPE_AP)
|
|
|
- iwl_activate_qos(priv, 1);
|
|
|
- else if (priv->assoc_id && iwl_is_associated(priv))
|
|
|
- iwl_activate_qos(priv, 0);
|
|
|
-
|
|
|
- mutex_unlock(&priv->mutex);
|
|
|
-
|
|
|
- IWL_DEBUG_MAC80211(priv, "leave\n");
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw,
|
|
|
struct ieee80211_tx_queue_stats *stats)
|
|
|
{
|
|
@@ -4809,7 +4763,7 @@ static struct ieee80211_ops iwl3945_hw_ops = {
|
|
|
.configure_filter = iwl_configure_filter,
|
|
|
.set_key = iwl3945_mac_set_key,
|
|
|
.get_tx_stats = iwl3945_mac_get_tx_stats,
|
|
|
- .conf_tx = iwl3945_mac_conf_tx,
|
|
|
+ .conf_tx = iwl_mac_conf_tx,
|
|
|
.reset_tsf = iwl3945_mac_reset_tsf,
|
|
|
.bss_info_changed = iwl3945_bss_info_changed,
|
|
|
.hw_scan = iwl_mac_hw_scan
|