Commit 8b7b1e05 authored Jun 11, 2008 by Harvey Harrison Committed by John W. Linville Jun 14, 2008

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>

parent fd7c8a40

drivers/net/wireless/iwlwifi/iwl-tx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -590,7 +590,7 @@ static void iwl_tx_cmd_build_basic(struct iwl_priv *priv,


		tx_cmd->sta_id = std_id;
		if (ieee80211_get_morefrag(hdr))
		if (ieee80211_has_morefrags(fc))
		tx_flags \|= TX_CMD_FLG_MORE_FRAG_MSK;

		if (ieee80211_is_data_qos(fc)) {
		@@ -944,7 +944,7 @@ int iwl_tx_skb(struct iwl_priv priv, struct sk_buff skb)
		tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
		tx_cmd->dram_msb_ptr = iwl_get_dma_hi_address(scratch_phys);

		if (!ieee80211_get_morefrag(hdr)) {
		if (!ieee80211_has_morefrags(hdr->frame_control)) {
		txq->need_update = 1;
		if (qc)
		priv->stations[sta_id].tid[tid].seq_number = seq_number;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2448,7 +2448,7 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv,
		}

		cmd->cmd.tx.sta_id = std_id;
		if (ieee80211_get_morefrag(hdr))
		if (ieee80211_has_morefrags(fc))
		tx_flags \|= TX_CMD_FLG_MORE_FRAG_MSK;

		if (ieee80211_is_data_qos(fc)) {
		@@ -2731,7 +2731,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv priv, struct sk_buff skb)
		out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_A_MSK;
		out_cmd->cmd.tx.tx_flags &= ~TX_CMD_FLG_ANT_B_MSK;

		if (!ieee80211_get_morefrag(hdr)) {
		if (!ieee80211_has_morefrags(hdr->frame_control)) {
		txq->need_update = 1;
		if (qc) {
		priv->stations[sta_id].tid[tid].seq_number = seq_number;

drivers/net/wireless/rt2x00/rt2x00queue.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
		/*
		* Check if more fragments are pending
		*/
		if (ieee80211_get_morefrag(hdr)) {
		if (ieee80211_has_morefrags(hdr->frame_control)) {
		__set_bit(ENTRY_TXD_BURST, &txdesc->flags);
		__set_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags);
		}

drivers/net/wireless/rtl8187_dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ static int rtl8187_tx(struct ieee80211_hw dev, struct sk_buff skb)
		flags \|= RTL8187_TX_FLAG_NO_ENCRYPT;

		flags \|= ieee80211_get_tx_rate(dev, info)->hw_value << 24;
		if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb->data))
		if (ieee80211_has_morefrags(((struct ieee80211_hdr *)skb->data)->frame_control))
		flags \|= RTL8187_TX_FLAG_MORE_FRAG;
		if (info->flags & IEEE80211_TX_CTL_USE_RTS_CTS) {
		flags \|= RTL8187_TX_FLAG_RTS;

include/linux/ieee80211.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -956,18 +956,4 @@ static inline u8 ieee80211_get_DA(struct ieee80211_hdr hdr)
		return hdr->addr1;
		}

		/**
		* ieee80211_get_morefrag - determine whether the MOREFRAGS bit is set
		*
		* This function determines whether the "more fragments" bit is set
		* in the frame.
		*
		* @hdr: the frame
		*/
		static inline int ieee80211_get_morefrag(struct ieee80211_hdr *hdr)
		{
		__le16 fc = hdr->frame_control;
		return !!(fc & cpu_to_le16(IEEE80211_FCTL_MOREFRAGS));
		}

		#endif /* IEEE80211_H */