diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 98c434c52a64..7296e2846ec3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
@@ -590,7 +590,7 @@ static void iwl_tx_cmd_build_basic(struct iwl_priv *priv, | |||
590 | 590 | ||
591 | 591 | ||
592 | tx_cmd->sta_id = std_id; | 592 | tx_cmd->sta_id = std_id; |
593 | if (ieee80211_get_morefrag(hdr)) | 593 | if (ieee80211_has_morefrags(fc)) |
594 | tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK; | 594 | tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK; |
595 | 595 | ||
596 | if (ieee80211_is_data_qos(fc)) { | 596 | if (ieee80211_is_data_qos(fc)) { |
@@ -944,7 +944,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) | |||
944 | tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys); | 944 | tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys); |
945 | tx_cmd->dram_msb_ptr = iwl_get_dma_hi_address(scratch_phys); | 945 | tx_cmd->dram_msb_ptr = iwl_get_dma_hi_address(scratch_phys); |
946 | 946 | ||
947 | if (!ieee80211_get_morefrag(hdr)) { | 947 | if (!ieee80211_has_morefrags(hdr->frame_control)) { |
948 | txq->need_update = 1; | 948 | txq->need_update = 1; |
949 | if (qc) | 949 | if (qc) |
950 | priv->stations[sta_id].tid[tid].seq_number = seq_number; | 950 | priv->stations[sta_id].tid[tid].seq_number = seq_number; |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 0a5bbe9ee938..47cf4b997f50 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -2448,7 +2448,7 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv, | |||
2448 | } | 2448 | } |
2449 | 2449 | ||
2450 | cmd->cmd.tx.sta_id = std_id; | 2450 | cmd->cmd.tx.sta_id = std_id; |
2451 | if (ieee80211_get_morefrag(hdr)) | 2451 | if (ieee80211_has_morefrags(fc)) |
2452 | tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK; | 2452 | tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK; |
2453 | 2453 | ||
2454 | if (ieee80211_is_data_qos(fc)) { | 2454 | if (ieee80211_is_data_qos(fc)) { |
@@ -2731,7 +2731,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) | |||
2731 | out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; | 2731 | out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; |
2732 | out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; | 2732 | out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; |
2733 | 2733 | ||
2734 | if (!ieee80211_get_morefrag(hdr)) { | 2734 | if (!ieee80211_has_morefrags(hdr->frame_control)) { |
2735 | txq->need_update = 1; | 2735 | txq->need_update = 1; |
2736 | if (qc) { | 2736 | if (qc) { |
2737 | priv->stations[sta_id].tid[tid].seq_number = seq_number; | 2737 | priv->stations[sta_id].tid[tid].seq_number = seq_number; |