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

mac80211: remove queue info from ieee80211_tx_status



The queue info in struct ieee80211_tx_status is never used.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 57ffc589
...@@ -2522,8 +2522,6 @@ static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv, ...@@ -2522,8 +2522,6 @@ static void iwl4965_txstatus_to_ieee(struct iwl_priv *priv,
tx_sta->status.ack_signal = 0; tx_sta->status.ack_signal = 0;
tx_sta->status.excessive_retries = 0; tx_sta->status.excessive_retries = 0;
tx_sta->status.queue_length = 0;
tx_sta->status.queue_number = 0;
if (in_interrupt()) if (in_interrupt())
ieee80211_tx_status_irqsafe(priv->hw, ieee80211_tx_status_irqsafe(priv->hw,
...@@ -2659,8 +2657,6 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, ...@@ -2659,8 +2657,6 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv,
tx_status = &(priv->txq[txq_id].txb[idx].status); tx_status = &(priv->txq[txq_id].txb[idx].status);
tx_status->retry_count = tx_resp->failure_frame; tx_status->retry_count = tx_resp->failure_frame;
tx_status->queue_number = status & 0xff;
tx_status->queue_length = tx_resp->failure_rts;
tx_status->control.flags &= ~IEEE80211_TXCTL_AMPDU; tx_status->control.flags &= ~IEEE80211_TXCTL_AMPDU;
tx_status->flags = iwl4965_is_tx_success(status)? tx_status->flags = iwl4965_is_tx_success(status)?
IEEE80211_TX_STATUS_ACK : 0; IEEE80211_TX_STATUS_ACK : 0;
...@@ -2820,9 +2816,6 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, ...@@ -2820,9 +2816,6 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
tx_status = &(txq->txb[txq->q.read_ptr].status); tx_status = &(txq->txb[txq->q.read_ptr].status);
tx_status->retry_count = tx_resp->failure_frame; tx_status->retry_count = tx_resp->failure_frame;
tx_status->queue_number = status;
tx_status->queue_length = tx_resp->bt_kill_count;
tx_status->queue_length |= tx_resp->failure_rts;
tx_status->flags = tx_status->flags =
iwl4965_is_tx_success(status) ? IEEE80211_TX_STATUS_ACK : 0; iwl4965_is_tx_success(status) ? IEEE80211_TX_STATUS_ACK : 0;
iwl4965_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags), iwl4965_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),
......
...@@ -525,9 +525,6 @@ void rt2x00lib_txdone(struct queue_entry *entry, ...@@ -525,9 +525,6 @@ void rt2x00lib_txdone(struct queue_entry *entry,
rt2x00dev->low_level_stats.dot11ACKFailureCount++; rt2x00dev->low_level_stats.dot11ACKFailureCount++;
} }
tx_status.queue_length = entry->queue->limit;
tx_status.queue_number = tx_status.control.queue;
if (tx_status.control.flags & IEEE80211_TXCTL_USE_RTS_CTS) { if (tx_status.control.flags & IEEE80211_TXCTL_USE_RTS_CTS) {
if (success) if (success)
rt2x00dev->low_level_stats.dot11RTSSuccessCount++; rt2x00dev->low_level_stats.dot11RTSSuccessCount++;
......
...@@ -417,8 +417,6 @@ enum ieee80211_tx_status_flags { ...@@ -417,8 +417,6 @@ enum ieee80211_tx_status_flags {
* @ampdu_ack_map: block ack bit map for the aggregation. * @ampdu_ack_map: block ack bit map for the aggregation.
* relevant only if IEEE80211_TX_STATUS_AMPDU was set. * relevant only if IEEE80211_TX_STATUS_AMPDU was set.
* @ack_signal: signal strength of the ACK frame * @ack_signal: signal strength of the ACK frame
* @queue_length: ?? REMOVE
* @queue_number: ?? REMOVE
*/ */
struct ieee80211_tx_status { struct ieee80211_tx_status {
struct ieee80211_tx_control control; struct ieee80211_tx_control control;
...@@ -428,8 +426,6 @@ struct ieee80211_tx_status { ...@@ -428,8 +426,6 @@ struct ieee80211_tx_status {
u8 ampdu_ack_len; u8 ampdu_ack_len;
u64 ampdu_ack_map; u64 ampdu_ack_map;
int ack_signal; int ack_signal;
int queue_length;
int queue_number;
}; };
/** /**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment