aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-tx.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-06-11 17:21:56 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 12:18:12 -0400
commit8b7b1e05b0454f232b8ae1e6ee134b7f0b38abfb (patch)
treee2b31bc4158a0e5ba20fe5ca81f7c9d4d51390d5 /drivers/net/wireless/iwlwifi/iwl-tx.c
parentfd7c8a40b2a63863f749e4d17f0d94d2e5ab1331 (diff)
mac80211: remove ieee80211_get_morefrag
Replaced by the new helper ieee80211_has_morefrags which is more consistent with the intent of the function. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c4
1 files changed, 2 insertions, 2 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;