diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 8c466b02bdff..438c3812c390 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -1252,7 +1252,6 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, | |||
1252 | struct iwl5000_tx_resp *tx_resp = (void *)&pkt->u.raw[0]; | 1252 | struct iwl5000_tx_resp *tx_resp = (void *)&pkt->u.raw[0]; |
1253 | u32 status = le16_to_cpu(tx_resp->status.status); | 1253 | u32 status = le16_to_cpu(tx_resp->status.status); |
1254 | int tid = MAX_TID_COUNT, sta_id = IWL_INVALID_STATION; | 1254 | int tid = MAX_TID_COUNT, sta_id = IWL_INVALID_STATION; |
1255 | u16 fc; | ||
1256 | struct ieee80211_hdr *hdr; | 1255 | struct ieee80211_hdr *hdr; |
1257 | u8 *qc = NULL; | 1256 | u8 *qc = NULL; |
1258 | 1257 | ||
@@ -1268,9 +1267,8 @@ static void iwl5000_rx_reply_tx(struct iwl_priv *priv, | |||
1268 | memset(&info->status, 0, sizeof(info->status)); | 1267 | memset(&info->status, 0, sizeof(info->status)); |
1269 | 1268 | ||
1270 | hdr = iwl_tx_queue_get_hdr(priv, txq_id, index); | 1269 | hdr = iwl_tx_queue_get_hdr(priv, txq_id, index); |
1271 | fc = le16_to_cpu(hdr->frame_control); | 1270 | if (ieee80211_is_data_qos(hdr->frame_control)) { |
1272 | if (ieee80211_is_qos_data(fc)) { | 1271 | qc = ieee80211_get_qos_ctl(hdr); |
1273 | qc = ieee80211_get_qos_ctrl(hdr, ieee80211_get_hdrlen(fc)); | ||
1274 | tid = qc[0] & 0xf; | 1272 | tid = qc[0] & 0xf; |
1275 | } | 1273 | } |
1276 | 1274 | ||