Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e7690f1 authored by Rami Rosen's avatar Rami Rosen Committed by John W. Linville
Browse files

iwlwifi: iwl-tx.c cleanup (remove unused parameter and unused local variable). 



This patch removes unused parameter and unused local variable in
methods in iwl-tx.c:

- Remove a parameter (is_unicast) from iwl_tx_cmd_build_basic().

- Remove an unused variable name unicast from iwl_tx_skb().

Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent be2864cf

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -645,7 +645,7 @@ static void iwl_tx_cmd_build_basic(struct iwl_priv *priv, 
				  struct iwl_tx_cmd *tx_cmd,

				  struct iwl_tx_cmd *tx_cmd,

				  struct ieee80211_tx_info *info,

				  struct ieee80211_tx_info *info,

				  struct ieee80211_hdr *hdr,

				  struct ieee80211_hdr *hdr,

				  int is_unicast, u8 std_id)

				  u8 std_id)

{

{

	__le16 fc = hdr->frame_control;

	__le16 fc = hdr->frame_control;

	__le32 tx_flags = tx_cmd->tx_flags;

	__le32 tx_flags = tx_cmd->tx_flags;
@@ -834,7 +834,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	u16 len, len_org;

	u16 len, len_org;

	u16 seq_number = 0;

	u16 seq_number = 0;

	__le16 fc;

	__le16 fc;

	u8 hdr_len, unicast;

	u8 hdr_len;

	u8 sta_id;

	u8 sta_id;

	u8 wait_write_ptr = 0;

	u8 wait_write_ptr = 0;

	u8 tid = 0;

	u8 tid = 0;
@@ -854,8 +854,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
		goto drop_unlock;

		goto drop_unlock;

	}

	}





	unicast = !is_multicast_ether_addr(hdr->addr1);



	fc = hdr->frame_control;

	fc = hdr->frame_control;





#ifdef CONFIG_IWLWIFI_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG
@@ -994,7 +992,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	len = (u16)skb->len;

	len = (u16)skb->len;

	tx_cmd->len = cpu_to_le16(len);

	tx_cmd->len = cpu_to_le16(len);

	/* TODO need this for burst mode later on */

	/* TODO need this for burst mode later on */

	iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, unicast, sta_id);

	iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id);





	/* set is_hcca to 0; it probably will never be implemented */

	/* set is_hcca to 0; it probably will never be implemented */

	iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0);

	iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0);