diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-06-11 17:21:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:12 -0400 |
commit | 8b7b1e05b0454f232b8ae1e6ee134b7f0b38abfb (patch) | |
tree | e2b31bc4158a0e5ba20fe5ca81f7c9d4d51390d5 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | fd7c8a40b2a63863f749e4d17f0d94d2e5ab1331 (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/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |