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().
(wireless-testing).
Signed-off-by: Rami Rosen <[email protected]>
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c
b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 3cb4363..43dcfe3 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,
struct iwl_tx_cmd *tx_cmd,
struct ieee80211_tx_info *info,
struct ieee80211_hdr *hdr,
- int is_unicast, u8 std_id)
+ u8 std_id)
{
__le16 fc = hdr->frame_control;
__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 seq_number = 0;
__le16 fc;
- u8 hdr_len, unicast;
+ u8 hdr_len;
u8 sta_id;
u8 wait_write_ptr = 0;
u8 tid = 0;
@@ -854,8 +854,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
goto drop_unlock;
}
- unicast = !is_multicast_ether_addr(hdr->addr1);
-
fc = hdr->frame_control;
#ifdef CONFIG_IWLWIFI_DEBUG
@@ -996,7 +994,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
len = (u16)skb->len;
tx_cmd->len = cpu_to_le16(len);
/* 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 */
iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0);
On Thu, Dec 18, 2008 at 5:31 PM, John W. Linville
<[email protected]> wrote:
> On Thu, Dec 18, 2008 at 12:42:37AM +0200, Tomas Winkler wrote:
>> On Wed, Dec 17, 2008 at 11:51 PM, Rami Rosen <[email protected]> wrote:
>> > This patch removes unused parameters in methods in iwl-tx.c:
>> > remove a parameter (is_unicast) from iwl_tx_cmd_build_basic()
>> > remove a parameter (sta_id) from iwl_tx_cmd_build_rate()
>> > remove a parameter (sta_id ) from iwl_tx_cmd_build_hwcrypto()
>>
>> Unicast can go sta_id has to stay, we need it for merging 3945 back
>
> OK, I'll drop this patch and wait for a new submission.
>
> John
> --
> John W. Linville Linux should be at the core
> [email protected] of your literate lifestyle.
>
On Thu, Dec 18, 2008 at 6:04 PM, Rami Rosen <[email protected]> wrote:
> 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().
>
> (wireless-testing).
>
> Signed-off-by: Rami Rosen <[email protected]>
Ack
Tomas
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c
> b/drivers/net/wireless/iwlwifi/iwl-tx.c
> index 3cb4363..43dcfe3 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,
> struct iwl_tx_cmd *tx_cmd,
> struct ieee80211_tx_info *info,
> struct ieee80211_hdr *hdr,
> - int is_unicast, u8 std_id)
> + u8 std_id)
> {
> __le16 fc = hdr->frame_control;
> __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 seq_number = 0;
> __le16 fc;
> - u8 hdr_len, unicast;
> + u8 hdr_len;
> u8 sta_id;
> u8 wait_write_ptr = 0;
> u8 tid = 0;
> @@ -854,8 +854,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
> goto drop_unlock;
> }
>
> - unicast = !is_multicast_ether_addr(hdr->addr1);
> -
> fc = hdr->frame_control;
>
> #ifdef CONFIG_IWLWIFI_DEBUG
> @@ -996,7 +994,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
> len = (u16)skb->len;
> tx_cmd->len = cpu_to_le16(len);
> /* 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 */
> iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0);
>
>
> On Thu, Dec 18, 2008 at 5:31 PM, John W. Linville
> <[email protected]> wrote:
>> On Thu, Dec 18, 2008 at 12:42:37AM +0200, Tomas Winkler wrote:
>>> On Wed, Dec 17, 2008 at 11:51 PM, Rami Rosen <[email protected]> wrote:
>>> > This patch removes unused parameters in methods in iwl-tx.c:
>>> > remove a parameter (is_unicast) from iwl_tx_cmd_build_basic()
>>> > remove a parameter (sta_id) from iwl_tx_cmd_build_rate()
>>> > remove a parameter (sta_id ) from iwl_tx_cmd_build_hwcrypto()
>>>
>>> Unicast can go sta_id has to stay, we need it for merging 3945 back
>>
>> OK, I'll drop this patch and wait for a new submission.
>>
>> John
>> --
>> John W. Linville Linux should be at the core
>> [email protected] of your literate lifestyle.
>>
>