2009-08-12 11:07:31

by Kalle Valo

Subject: [PATCH] iwl3945: fix compilation error in iwl3945_pass_packet_to_mac80211()

Commit "iwlwifi: Traffic type and counter for debugFs" broke iwl3945 in
a case when CONFIG_IWLWIFI_LEDS is disabled:

drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)

Fix it by removing the ifdef check for hdr variable.

Signed-off-by: Kalle Valo <[email protected]>
---

drivers/net/wireless/iwlwifi/iwl-3945.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index ae7f163..ba5ef83 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -544,9 +544,7 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv,
struct ieee80211_rx_status *stats)
{
struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
-#ifdef CONFIG_IWLWIFI_LEDS
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);
-#endif
struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
short len = le16_to_cpu(rx_hdr->len);

2009-08-12 15:37:20

by Reinette Chatre

Subject: Re: [PATCH] iwl3945: fix compilation error in iwl3945_pass_packet_to_mac80211()

On Wed, 2009-08-12 at 04:07 -0700, Kalle Valo wrote:
> Commit "iwlwifi: Traffic type and counter for debugFs" broke iwl3945 in
> a case when CONFIG_IWLWIFI_LEDS is disabled:
>
> drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)
>
> Fix it by removing the ifdef check for hdr variable.
>
> Signed-off-by: Kalle Valo <[email protected]>
> ---
>
> drivers/net/wireless/iwlwifi/iwl-3945.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
> index ae7f163..ba5ef83 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-3945.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
> @@ -544,9 +544,7 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv,
> struct ieee80211_rx_status *stats)
> {
> struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
> -#ifdef CONFIG_IWLWIFI_LEDS
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);
> -#endif
> struct iwl3945_rx_frame_hdr *rx_hdr = IWL_RX_HDR(pkt);
> struct iwl3945_rx_frame_end *rx_end = IWL_RX_END(pkt);
> short len = le16_to_cpu(rx_hdr->len);
>

We have an identical patch pending. I assumed most people compile with
led support and thus did not rush to get it in. Now that it is a problem
for more people I think this one should go in.

Acked-by: Reinette Chatre <[email protected]>

Thank you

Reinette

2009-08-12 18:27:17

by Kalle Valo

Subject: Re: [PATCH] iwl3945: fix compilation error in iwl3945_pass_packet_to_mac80211()

reinette chatre <[email protected]> writes:

> On Wed, 2009-08-12 at 04:07 -0700, Kalle Valo wrote:
>> Commit "iwlwifi: Traffic type and counter for debugFs" broke iwl3945 in
>> a case when CONFIG_IWLWIFI_LEDS is disabled:
>>
>> drivers/net/wireless/iwlwifi/iwl-3945.c:580: error: 'hdr' undeclared (first use in this function)
>>
>> Fix it by removing the ifdef check for hdr variable.

[...]

> We have an identical patch pending. I assumed most people compile with
> led support and thus did not rush to get it in.

I don't remember why I have leds disabled. Most probably some problem a
long time ago and I never bothered to turn it back on.

> Now that it is a problem for more people I think this one should go
> in.

I agree that this should go in. Compilation errors are always annoying.

--
Kalle Valo