aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRami Rosen <ramirose@gmail.com>2008-12-18 11:04:51 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-19 15:23:54 -0500
commit0e7690f1e9ee1e762f27678d2ea10e4c1fde3236 (patch)
tree84f2bffc2eb0a7258704e235f44ca268a5711b4a
parentbe2864cfff2fe4b599b46f03cce1e7689e05c60c (diff)
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: Rami Rosen <ramirose@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 1e7cd8d9039e..b0ee86c62685 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -645,7 +645,7 @@ static void iwl_tx_cmd_build_basic(struct iwl_priv *priv,
645 struct iwl_tx_cmd *tx_cmd, 645 struct iwl_tx_cmd *tx_cmd,
646 struct ieee80211_tx_info *info, 646 struct ieee80211_tx_info *info,
647 struct ieee80211_hdr *hdr, 647 struct ieee80211_hdr *hdr,
648 int is_unicast, u8 std_id) 648 u8 std_id)
649{ 649{
650 __le16 fc = hdr->frame_control; 650 __le16 fc = hdr->frame_control;
651 __le32 tx_flags = tx_cmd->tx_flags; 651 __le32 tx_flags = tx_cmd->tx_flags;
@@ -834,7 +834,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
834 u16 len, len_org; 834 u16 len, len_org;
835 u16 seq_number = 0; 835 u16 seq_number = 0;
836 __le16 fc; 836 __le16 fc;
837 u8 hdr_len, unicast; 837 u8 hdr_len;
838 u8 sta_id; 838 u8 sta_id;
839 u8 wait_write_ptr = 0; 839 u8 wait_write_ptr = 0;
840 u8 tid = 0; 840 u8 tid = 0;
@@ -854,8 +854,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
854 goto drop_unlock; 854 goto drop_unlock;
855 } 855 }
856 856
857 unicast = !is_multicast_ether_addr(hdr->addr1);
858
859 fc = hdr->frame_control; 857 fc = hdr->frame_control;
860 858
861#ifdef CONFIG_IWLWIFI_DEBUG 859#ifdef CONFIG_IWLWIFI_DEBUG
@@ -994,7 +992,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
994 len = (u16)skb->len; 992 len = (u16)skb->len;
995 tx_cmd->len = cpu_to_le16(len); 993 tx_cmd->len = cpu_to_le16(len);
996 /* TODO need this for burst mode later on */ 994 /* TODO need this for burst mode later on */
997 iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, unicast, sta_id); 995 iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id);
998 996
999 /* set is_hcca to 0; it probably will never be implemented */ 997 /* set is_hcca to 0; it probably will never be implemented */
1000 iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0); 998 iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0);